Bump v4.0.0-beta.2

fix: update and enable osr (backport: 4-0-x) (#15084 )
* fix: update and enable osr * fix: update MacHelper view to call GetNativeView * style: move stuff around to make more sense * chore: move OSR related things in SetOwnerWindow to CommonWebContentsDelegate * fix: avoid crashing when GetOffscreenRenderWidgetHostView is called * fix: specify default for current_device_scale_factor_
2026-04-10 03:01:51 -04:00 · 2018-10-11 16:27:07 -07:00 · 2018-10-11 10:01:27 -07:00 · 2018-10-11 10:41:11 -05:00 · 2018-10-11 10:39:30 -05:00 · 2018-10-10 22:01:00 -07:00
884 changed files with 31747 additions and 25646 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,12 +1,3 @@
-# The config expects the following environment variables to be set:
-#  - "SLACK_WEBHOOK" Slack hook URL to send notifications.
-#
-# The publishing scripts expect access tokens to be defined as env vars,
-# but those are not covered here.
-#
-# CircleCI docs on variables:
-# https://circleci.com/docs/2.0/env-vars/
-
 # Build machines configs.
 docker-image: &docker-image
  docker:
@@ -42,13 +33,13 @@ env-stack-dumping: &env-stack-dumping
  ELECTRON_ENABLE_STACK_DUMPING: '1'

 env-browsertests: &env-browsertests
-  GN_CONFIG: //electron/build/args/native_tests.gn
-  BUILD_TARGET: electron/spec:chromium_browsertests
+  GN_EXTRA_ARGS: 'is_component_ffmpeg = false'
+  BUILD_TARGET: electron:chromium_browsertests
  TESTS_CONFIG: src/electron/spec/configs/browsertests.yml

 env-unittests: &env-unittests
-  GN_CONFIG: //electron/build/args/native_tests.gn
-  BUILD_TARGET: electron/spec:chromium_unittests
+  GN_EXTRA_ARGS: 'is_component_ffmpeg = false'
+  BUILD_TARGET: electron:chromium_unittests
  TESTS_CONFIG: src/electron/spec/configs/unittests.yml

 # Build targets options.
@@ -154,7 +145,6 @@ step-install-nodejs-on-mac: &step-install-nodejs-on-mac
      if [ "`uname`" == "Darwin" ]; then
        brew update
        brew install node@10
-        echo 'export PATH="/usr/local/opt/node@10/bin:$PATH"' >> $BASH_ENV
      fi

 step-gn-gen-default: &step-gn-gen-default
@@ -167,7 +157,6 @@ step-gn-gen-default: &step-gn-gen-default
 step-electron-build: &step-electron-build
  run:
    name: Electron build
-    no_output_timeout: 30m
    command: |
      cd src
      ninja -C out/Default electron -j18
@@ -244,7 +233,6 @@ step-persist-data-for-tests: &step-persist-data-for-tests

      # Build artifacts
      - src/out/Default/dist.zip
-      - src/out/Default/mksnapshot.zip
      - src/out/Default/gen/node_headers

 step-electron-dist-unzip: &step-electron-dist-unzip
@@ -256,13 +244,6 @@ step-electron-dist-unzip: &step-electron-dist-unzip
      # TODO(alexeykuzmin): Remove '-o' when it's no longer needed.
      unzip -o dist.zip

-step-mksnapshot-unzip: &step-mksnapshot-unzip
-  run:
-    name: Unzip mksnapshot.zip
-    command: |
-      cd src/out/Default
-      unzip -o mksnapshot.zip
-
 step-ffmpeg-gn-gen: &step-ffmpeg-gn-gen
  run:
    name: ffmpeg GN gen
@@ -291,13 +272,6 @@ step-ffmpeg-store: &step-ffmpeg-store
    path: src/out/ffmpeg/ffmpeg.zip
    destination: ffmpeg.zip

-step-verify-mksnapshot: &step-verify-mksnapshot
-  run:
-    name: Verify mksnapshot
-    command: |
-      cd src
-      python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default
-
 step-setup-linux-for-headless-testing: &step-setup-linux-for-headless-testing
  run:
    name: Setup for headless testing
@@ -337,30 +311,20 @@ step-mksnapshot-store: &step-mksnapshot-store
    path: src/out/Default/mksnapshot.zip
    destination: mksnapshot.zip

-step-build-dump-syms: &step-build-dump-syms
-  run:
-    name: Build dump_syms binary
-    command: |
-      cd src
-      # Build needed dump_syms executable
-      ninja -C out/Default third_party/breakpad:dump_syms
-
 step-generate-breakpad-symbols: &step-generate-breakpad-symbols
  run:
    name: Generate breakpad symbols
+    environment:
+      # TODO(alexeykuzmin): Explicitly pass an out folder path to the scripts.
+      ELECTRON_OUT_DIR: Default
    command: |
      cd src
-      export BUILD_PATH="$PWD/out/Default"
-      export DEST_PATH="$BUILD_PATH/breakpad_symbols"
-      electron/script/dump-symbols.py -b $BUILD_PATH -d $DEST_PATH -v

-step-zip-symbols: &step-zip-symbols
-  run:
-    name: Zip symbols
-    command: |
-      cd src
-      export BUILD_PATH="$PWD/out/Default"
-      electron/script/zip-symbols.py -b $BUILD_PATH
+      # Build needed dump_syms executable
+      ninja -C out/Default third_party/breakpad:dump_syms
+
+      electron/script/dump-symbols.py -d "$PWD/out/Default/electron.breakpad.syms"
+      electron/script/zip-symbols.py

 step-maybe-native-mksnapshot-gn-gen: &step-maybe-native-mksnapshot-gn-gen
  run:
@@ -368,7 +332,7 @@ step-maybe-native-mksnapshot-gn-gen: &step-maybe-native-mksnapshot-gn-gen
    command: |
      if [ "$BUILD_NATIVE_MKSNAPSHOT" == "1" ]; then
        cd src
-        gn gen out/native_mksnapshot --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_PATH"'" v8_snapshot_toolchain="'"$MKSNAPSHOT_TOOLCHAIN"'"'" $GN_EXTRA_ARGS v8_enable_embedded_builtins = false"
+        gn gen out/native_mksnapshot --args='import("//electron/build/args/native_mksnapshot.gn") cc_wrapper="'"$SCCACHE_PATH"'" v8_snapshot_toolchain="'"$MKSNAPSHOT_TOOLCHAIN"'"'" $GN_EXTRA_ARGS"
      else
        echo 'Skipping native mksnapshot GN gen for non arm build'
      fi
@@ -376,11 +340,12 @@ step-maybe-native-mksnapshot-gn-gen: &step-maybe-native-mksnapshot-gn-gen
 step-maybe-native-mksnapshot-build: &step-maybe-native-mksnapshot-build
  run:
    name: Native mksnapshot build (arm/arm64)
-    no_output_timeout: 30m
    command: |
      if [ "$BUILD_NATIVE_MKSNAPSHOT" == "1" ]; then
        cd src
-        ninja -C out/native_mksnapshot electron:electron_mksnapshot_zip -j18
+        # NOTE(jeremy): -j3 because mksnapshot is currently built on a smaller
+        # machine size and ninja mis-detects the number of CPUs available.
+        ninja -C out/native_mksnapshot electron:electron_mksnapshot_zip -j3
      else
        echo 'Skipping native mksnapshot build for non arm build'
      fi
@@ -488,29 +453,12 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests

    - *step-show-sccache-stats

-    # mksnapshot
-    - *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
-
-    # ffmpeg
-    - *step-ffmpeg-gn-gen
-    - *step-ffmpeg-build
-    - *step-ffmpeg-store
-
    # Save all data needed for a further tests run.
    - *step-persist-data-for-tests

    # Breakpad symbols.
    # TODO(alexeykuzmin): We should do it only in nightly builds.
-    - *step-build-dump-syms
    - *step-generate-breakpad-symbols
-    - *step-zip-symbols

    # Trigger tests on arm hardware if needed
    - *step-maybe-trigger-arm-test
@@ -531,9 +479,7 @@ steps-electron-build-for-publish: &steps-electron-build-for-publish
    - *step-maybe-electron-dist-strip
    - *step-electron-dist-build
    - *step-electron-dist-store
-    - *step-build-dump-syms
    - *step-generate-breakpad-symbols
-    - *step-zip-symbols

    # mksnapshot
    - *step-mksnapshot-build
@@ -629,8 +575,7 @@ steps-native-tests: &steps-native-tests
          python src/electron/script/native-tests.py run \
            --config $TESTS_CONFIG \
            --tests-dir src/out/Default \
-            --output-dir test_results  \
-            $TESTS_ARGS
+            --output-dir test_results

    - store_artifacts:
        path: test_results
@@ -649,25 +594,12 @@ steps-verify-ffmpeg: &steps-verify-ffmpeg
    - *step-verify-ffmpeg
    - *step-maybe-notify-slack-failure

-steps-verify-mksnapshot: &steps-verify-mksnapshot
-  steps:
-    - attach_workspace:
-        at: .
-    - *step-depot-tools-add-to-path
-    - *step-electron-dist-unzip
-    - *step-mksnapshot-unzip
-    - *step-setup-linux-for-headless-testing
-
-    - *step-verify-mksnapshot
-    - *step-maybe-notify-slack-failure
-
 steps-tests: &steps-tests
  steps:
    - attach_workspace:
        at: .
    - *step-depot-tools-add-to-path
    - *step-electron-dist-unzip
-    - *step-mksnapshot-unzip
    - *step-setup-linux-for-headless-testing
    - *step-install-nodejs-on-mac

@@ -693,8 +625,6 @@ steps-tests: &steps-tests
    - store_test_results:
        path: src/junit

-    - *step-verify-mksnapshot
-
    - *step-maybe-notify-slack-failure

 # Mac build are different in a few ways:
@@ -735,8 +665,6 @@ steps-build-mac: &steps-build-mac
    # to store all gn's dependencies and configs.
    - *step-verify-ffmpeg

-    - *step-verify-mksnapshot
-
    # Node.js headers for tests
    - *step-nodejs-headers-build

@@ -768,16 +696,8 @@ jobs:
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
    <<: *steps-checkout

-  linux-checkout-for-native-tests:
+  linux-x64-checkout:
    <<: *machine-linux-2xlarge
-    environment:
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_pyyaml=True'
-    <<: *steps-checkout
-
-  linux-checkout-for-native-tests-with-no-patches:
-    <<: *machine-linux-2xlarge
-    environment:
-      GCLIENT_EXTRA_ARGS: '--custom-var=apply_patches=False --custom-var=checkout_pyyaml=True'
    <<: *steps-checkout

  # Layer 2: Builds.
@@ -927,10 +847,9 @@ jobs:
    <<: *steps-electron-build-for-publish

  linux-arm-native-mksnapshot:
-    <<: *machine-linux-2xlarge
+    <<: *machine-linux-medium
    environment:
      <<: *env-arm
-      <<: *env-release-build
      <<: *env-enable-sccache
      <<: *env-send-slack-notifications
    <<: *steps-native-mksnapshot-build
@@ -987,10 +906,9 @@ jobs:
    <<: *steps-electron-build-for-publish

  linux-arm64-native-mksnapshot:
-    <<: *machine-linux-2xlarge
+    <<: *machine-linux-medium
    environment:
      <<: *env-arm64
-      <<: *env-release-build
      <<: *env-enable-sccache
      <<: *env-send-slack-notifications
    <<: *steps-native-mksnapshot-build
@@ -1015,28 +933,11 @@ jobs:
    <<: *machine-linux-2xlarge
    environment:
      <<: *env-unittests
+      <<: *env-testing-build
      <<: *env-enable-sccache
      <<: *env-headless-testing
    <<: *steps-native-tests

-  linux-x64-disabled-unittests:
-    <<: *machine-linux-2xlarge
-    environment:
-      <<: *env-unittests
-      <<: *env-enable-sccache
-      <<: *env-headless-testing
-      TESTS_ARGS: '--only-disabled-tests'
-    <<: *steps-native-tests
-
-  linux-x64-chromium-unittests:
-    <<: *machine-linux-2xlarge
-    environment:
-      <<: *env-unittests
-      <<: *env-enable-sccache
-      <<: *env-headless-testing
-      TESTS_ARGS: '--include-disabled-tests'
-    <<: *steps-native-tests
-
  linux-x64-browsertests:
    <<: *machine-linux-2xlarge
    environment:
@@ -1067,13 +968,6 @@ jobs:
      <<: *env-send-slack-notifications
    <<: *steps-verify-ffmpeg

-  linux-x64-verify-mksnapshot:
-    <<: *machine-linux-medium
-    environment:
-      <<: *env-headless-testing
-      <<: *env-send-slack-notifications
-    <<: *steps-verify-mksnapshot
-
  linux-ia32-testing-tests:
    <<: *machine-linux-medium
    environment:
@@ -1098,14 +992,6 @@ jobs:
      <<: *env-send-slack-notifications
    <<: *steps-verify-ffmpeg

-  linux-ia32-verify-mksnapshot:
-    <<: *machine-linux-medium
-    environment:
-      <<: *env-ia32
-      <<: *env-headless-testing
-      <<: *env-send-slack-notifications
-    <<: *steps-verify-mksnapshot
-
  osx-testing-tests:
    <<: *machine-mac
    environment:
@@ -1228,9 +1114,6 @@ workflows:
          requires:
            - linux-x64-release
            - linux-x64-ffmpeg
-      - linux-x64-verify-mksnapshot:
-          requires:
-            - linux-x64-release
      - linux-x64-chromedriver:
          requires:
            - linux-checkout
@@ -1255,9 +1138,6 @@ workflows:
          requires:
            - linux-ia32-release
            - linux-ia32-ffmpeg
-      - linux-ia32-verify-mksnapshot:
-          requires:
-            - linux-ia32-release
      - linux-ia32-chromedriver:
          requires:
            - linux-checkout
@@ -1319,25 +1199,15 @@ workflows:
                - master
                - *chromium-upgrade-branches
    jobs:
-      - linux-checkout-for-native-tests
+      - linux-x64-checkout

      # TODO(alexeykuzmin): Enable it back.
      # Tons of crashes right now, see
      # https://circleci.com/gh/electron/electron/67463
 #      - linux-x64-browsertests:
 #          requires:
-#            - linux-checkout-for-native-tests
+#            - linux-x64-checkout

      - linux-x64-unittests:
          requires:
-            - linux-checkout-for-native-tests
-
-      - linux-x64-disabled-unittests:
-          requires:
-            - linux-checkout-for-native-tests
-
-      - linux-checkout-for-native-tests-with-no-patches
-
-      - linux-x64-chromium-unittests:
-          requires:
-            - linux-checkout-for-native-tests-with-no-patches
+            - linux-x64-checkout
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
-#### Description of Change
+##### Description of Change
 <!--
 Thank you for your Pull Request. Please provide a description above and review
 the requirements below.
@@ -6,7 +6,7 @@ the requirements below.
 Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTING.md
 -->

-#### Checklist
+##### Checklist
 <!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->

 - [ ] PR description included and stakeholders cc'd
@@ -14,9 +14,9 @@ Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTIN
 - [ ] tests are [changed or added](https://github.com/electron/electron/blob/master/docs/development/testing.md)
 - [ ] relevant documentation is changed or added
 - [ ] PR title follows semantic [commit guidelines](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines)
- [ ] [PR release notes](https://github.com/electron/clerk/blob/master/README.md) describe the change in a way relevant to app developers, and are [capitalized, punctuated, and past tense](https://github.com/electron/clerk/blob/master/README.md#examples).


-#### Release Notes
+##### Release Notes
+<!-- Used to describe release notes for future release versions. See https://github.com/electron/clerk/blob/master/README.md for details. -->

-Notes: <!-- Please add a one-line description for app developers to read in the release notes, or `no-notes` if no notes relevant to app developers. Examples and help on special cases: https://github.com/electron/clerk/blob/master/README.md#examples -->
+Notes: <!-- One-line Change Summary Here-->
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -36,15 +36,13 @@ newPRWelcomeComment: |
 firstPRMergeComment: >
  Congrats on merging your first pull request! 🎉🎉🎉

-# Configuration for trop - https://github.com/electron/trop
+# Configuration for trop - https://github.com/codebytere/trop

 watchedProject:
  name: Backports

-# Users authorized to run manual trop backports
 authorizedUsers:
  - alexeykuzmin
-  - BinaryMuse
  - ckerr
  - codebytere
  - deepak1556
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,13 @@
 *.vcxproj.user
 *.xcodeproj
 /.idea/
+/brightray/brightray.opensdf
+/brightray/brightray.sdf
+/brightray/brightray.sln
+/brightray/brightray.suo
+/brightray/brightray.v12.suo
+/brightray/brightray.vcxproj*
+/brightray/brightray.xcodeproj/
 /dist/
 /external_binaries/
 /out/
@@ -56,6 +63,3 @@ spec/.hash

 # Eslint Cache
 .eslintcache
-
-# Generated native addon files
-/spec/fixtures/native-addon/echo/build/
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1,19 +1,18 @@
-import("//build/config/locales.gni")
-import("//build/config/ui.gni")
-import("//build/config/win/manifest.gni")
-import("//pdf/features.gni")
-import("//services/service_manager/public/service_manifest.gni")
-import("//third_party/ffmpeg/ffmpeg_options.gni")
-import("//tools/generate_library_loader/generate_library_loader.gni")
-import("//tools/grit/grit_rule.gni")
-import("//tools/grit/repack.gni")
-import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
-import("//v8/snapshot_toolchain.gni")
 import("build/asar.gni")
 import("build/npm.gni")
 import("buildflags/buildflags.gni")
 import("electron_paks.gni")
 import("filenames.gni")
+import("//build/config/locales.gni")
+import("//build/config/win/manifest.gni")
+import("//pdf/features.gni")
+import("//services/service_manager/public/service_manifest.gni")
+import("//third_party/ffmpeg/ffmpeg_options.gni")
+import("//third_party/widevine/cdm/widevine.gni")
+import("//tools/grit/grit_rule.gni")
+import("//tools/grit/repack.gni")
+import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
+import("//v8/snapshot_toolchain.gni")

 if (is_mac) {
  import("//build/config/mac/rules.gni")
@@ -27,13 +26,6 @@ if (is_linux) {
  pkg_config("gio_unix") {
    packages = [ "gio-unix-2.0" ]
  }
-
-  pkg_config("libnotify_config") {
-    packages = [
-      "glib-2.0",
-      "gdk-pixbuf-2.0",
-    ]
-  }
 }

 branding = read_file("atom/app/BRANDING.json", "json")
@@ -54,49 +46,64 @@ config("branding") {
 }

 npm_action("atom_browserify_sandbox") {
-  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",
+  deps = [
+    ":atom_js2c_copy",
  ]

+  sandbox_args = [
+    "lib/sandboxed_renderer/init.js",
+    "-r",
+    "./lib/sandboxed_renderer/api/exports/electron.js:electron",
+    "-r",
+    "./lib/sandboxed_renderer/api/exports/fs.js:fs",
+    "-r",
+    "./lib/sandboxed_renderer/api/exports/os.js:os",
+    "-r",
+    "./lib/sandboxed_renderer/api/exports/path.js:path",
+    "-r",
+    "./lib/sandboxed_renderer/api/exports/child_process.js:child_process",
+    "-t",
+    "aliasify",
+  ]
+
+  inputs = [
+    "lib/sandboxed_renderer/init.js",
+    "lib/sandboxed_renderer/api/exports/electron.js",
+    "lib/sandboxed_renderer/api/exports/fs.js",
+    "lib/sandboxed_renderer/api/exports/os.js",
+    "lib/sandboxed_renderer/api/exports/path.js",
+    "lib/sandboxed_renderer/api/exports/child_process.js",
+  ]
  outputs = [
    "$target_gen_dir/js2c/preload_bundle.js",
  ]

-  args = [
-    "lib/sandboxed_renderer/init.js",
-    "-r",
-    "./lib/sandboxed_renderer/api/exports/electron.js:electron",
-    "-t",
-    "aliasify",
-    "-o",
-    rebase_path(outputs[0]),
-  ]
+  script = "browserify"
+  args = sandbox_args + [
+           "-o",
+           rebase_path(outputs[0]),
+         ]
 }

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

  inputs = [
    "lib/isolated_renderer/init.js",
  ]
-
  outputs = [
    "$target_gen_dir/js2c/isolated_bundle.js",
  ]

-  args = [
-    "lib/isolated_renderer/init.js",
-    "-t",
-    "aliasify",
-    "-o",
-    rebase_path(outputs[0]),
-  ]
+  script = "browserify"
+  args = inputs + [
+           "-t",
+           "aliasify",
+           "-o",
+           rebase_path(outputs[0]),
+         ]
 }

 copy("atom_js2c_copy") {
@@ -116,25 +123,23 @@ action("atom_js2c") {
    ":atom_js2c_copy",
  ]

+  js2c_sources = filenames.js2c_sources
+
  browserify_sources = [
    "$target_gen_dir/js2c/isolated_bundle.js",
    "$target_gen_dir/js2c/preload_bundle.js",
  ]

-  sources = browserify_sources + [
-              "$target_gen_dir/js2c/asar.js",
-              "$target_gen_dir/js2c/asar_init.js",
-            ]
+  inputs = js2c_sources + browserify_sources

-  inputs = sources
  outputs = [
-    "$root_gen_dir/atom_natives.cc",
+    "$target_gen_dir/atom_natives.h",
  ]

  script = "tools/js2c.py"
  args = [ rebase_path("//third_party/electron_node") ] +
         rebase_path(outputs, root_build_dir) +
-         rebase_path(sources, root_build_dir)
+         [ rebase_path("$target_gen_dir/js2c", root_build_dir) ]
 }

 asar("js2asar") {
@@ -151,8 +156,6 @@ asar("js2asar") {
      "lib/browser/api/views/button.js",
      "lib/browser/api/views/label-button.js",
      "lib/browser/api/views/layout-manager.js",
-      "lib/browser/api/views/md-text-button.js",
-      "lib/browser/api/views/resize-area.js",
      "lib/browser/api/views/text-field.js",
    ]
  }
@@ -178,54 +181,18 @@ grit("resources") {
    "electron_resources.pak",
  ]

-  # Mojo manifest overlays are generated.
-  source_is_generated = true
  grit_flags = [
    "-E",
    "target_gen_dir=" + rebase_path(target_gen_dir, root_build_dir),
  ]

  deps = [
-    ":copy_shell_devtools_discovery_page",
    ":electron_content_manifest_overlays",
  ]

  output_dir = "$target_gen_dir"
 }

-copy("copy_shell_devtools_discovery_page") {
-  sources = [
-    "//content/shell/resources/shell_devtools_discovery_page.html",
-  ]
-  outputs = [
-    "$target_gen_dir/shell_devtools_discovery_page.html",
-  ]
-}
-
-if (is_linux) {
-  generate_library_loader("libnotify_loader") {
-    name = "LibNotifyLoader"
-    output_h = "libnotify_loader.h"
-    output_cc = "libnotify_loader.cc"
-    header = "<libnotify/notify.h>"
-    config = ":libnotify_config"
-
-    functions = [
-      "notify_is_initted",
-      "notify_init",
-      "notify_get_server_caps",
-      "notify_get_server_info",
-      "notify_notification_new",
-      "notify_notification_add_action",
-      "notify_notification_set_image_from_pixbuf",
-      "notify_notification_set_timeout",
-      "notify_notification_set_hint_string",
-      "notify_notification_show",
-      "notify_notification_close",
-    ]
-  }
-}
-
 static_library("electron_lib") {
  configs += [ "//v8:external_startup_data" ]
  configs += [ "//third_party/electron_node:node_internals" ]
@@ -234,36 +201,29 @@ static_library("electron_lib") {

  deps = [
    ":atom_js2c",
+    "brightray",
    "buildflags",
    "chromium_src:chrome",
    "native_mate",
    "//base",
-    "//base:base_static",
    "//base:i18n",
-    "//chrome/app/resources:platform_locale_settings",
    "//components/certificate_transparency",
    "//components/net_log",
    "//components/network_session_configurator/common",
    "//components/prefs",
-    "//components/spellcheck/renderer",
-    "//components/viz/host",
+    "//components/printing/common",
    "//components/viz/service",
    "//content/public/app:both",
-    "//content/public/browser",
    "//content/public/child",
    "//content/public/common:service_names",
    "//gin",
-    "//media/capture/mojom:video_capture",
    "//media/mojo/interfaces",
-    "//net:extras",
    "//net:net_resources",
-    "//net:net_with_v8",
    "//ppapi/host",
    "//ppapi/proxy",
    "//ppapi/shared_impl",
-    "//services/device/public/mojom",
+    "//printing",
    "//services/proxy_resolver:lib",
-    "//services/viz/privileged/interfaces/compositing",
    "//skia",
    "//third_party/blink/public:blink",
    "//third_party/boringssl",
@@ -278,6 +238,12 @@ static_library("electron_lib") {
    "//v8",
  ]

+  # TODO: this requires a visibility patch to chromium src. it would be better
+  # to use the publicly-available API, which I think is mojo-based. Once
+  # electron switches to using the public API, we can remove this from the deps
+  # list and remove the visibility patch from chromium.
+  deps += [ "//services/device/wake_lock/power_save_blocker" ]
+
  include_dirs = [
    "chromium_src",
    ".",
@@ -288,13 +254,9 @@ static_library("electron_lib") {
    "//third_party/blink/renderer",
  ]

-  defines = [ "V8_DEPRECATION_WARNINGS" ]
+  defines = []
  libs = []

-  if (is_linux) {
-    defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ]
-  }
-
  extra_source_filters = []
  if (!is_linux) {
    extra_source_filters += [
@@ -333,6 +295,16 @@ static_library("electron_lib") {
  sources = filenames.lib_sources
  set_sources_assignment_filter(sources_assignment_filter)

+  sources += [
+    "$target_gen_dir/atom_natives.h",
+    "//extensions/browser/app_window/size_constraints.cc",
+    "//extensions/browser/app_window/size_constraints.h",
+    "//extensions/common/constants.cc",
+    "//extensions/common/constants.h",
+    "//extensions/common/url_pattern.cc",
+    "//extensions/common/url_pattern.h",
+  ]
+
  if (is_component_build) {
    defines += [ "NODE_SHARED_MODE" ]
  }
@@ -381,10 +353,8 @@ static_library("electron_lib") {
  }
  if (is_linux) {
    deps += [
-      ":libnotify_loader",
      "//build/config/linux/gtk",
      "//chrome/browser/ui/libgtkui",
-      "//dbus",
      "//device/bluetooth",
      "//ui/events/devices/x11",
      "//ui/events/platform/x11",
@@ -397,10 +367,10 @@ static_library("electron_lib") {
      # Disable warnings for g_settings_list_schemas.
      "GLIB_DISABLE_DEPRECATION_WARNINGS",
    ]
-
    sources += filenames.lib_sources_nss
  }
  if (is_win) {
+    sources += filenames.lib_sources_win
    libs += [ "dwmapi.lib" ]
  }
  if (is_linux || is_win) {
@@ -421,6 +391,7 @@ static_library("electron_lib") {

  if (enable_osr) {
    sources += [
+      "atom/browser/api/atom_api_web_contents_osr.cc",
      "atom/browser/osr/osr_output_device.cc",
      "atom/browser/osr/osr_output_device.h",
      "atom/browser/osr/osr_render_widget_host_view.cc",
@@ -461,27 +432,24 @@ static_library("electron_lib") {
      "atom/browser/api/views/atom_api_label_button.h",
      "atom/browser/api/views/atom_api_layout_manager.cc",
      "atom/browser/api/views/atom_api_layout_manager.h",
-      "atom/browser/api/views/atom_api_md_text_button.cc",
-      "atom/browser/api/views/atom_api_md_text_button.h",
-      "atom/browser/api/views/atom_api_resize_area.cc",
-      "atom/browser/api/views/atom_api_resize_area.h",
      "atom/browser/api/views/atom_api_text_field.cc",
      "atom/browser/api/views/atom_api_text_field.h",
    ]
  }

-  if (enable_basic_printing) {
-    sources += [
-      "atom/browser/printing/print_preview_message_handler.cc",
-      "atom/browser/printing/print_preview_message_handler.h",
-      "atom/renderer/printing/print_render_frame_helper_delegate.cc",
-      "atom/renderer/printing/print_render_frame_helper_delegate.h",
-    ]
-  }
-
  if (enable_pepper_flash) {
    deps += [ "components/pepper_flash" ]
  }
+
+  if (enable_widevine) {
+    sources += [
+      "//chrome/renderer/media/chrome_key_systems.cc",
+      "//chrome/renderer/media/chrome_key_systems.h",
+      "//chrome/renderer/media/chrome_key_systems_provider.cc",
+      "//chrome/renderer/media/chrome_key_systems_provider.h",
+    ]
+    deps += [ "//components/cdm/renderer" ]
+  }
 }

 electron_paks("packed_resources") {
@@ -580,7 +548,7 @@ if (is_mac) {
    }
    info_plist = "atom/common/resources/mac/Info.plist"

-    electron_version = read_file("ELECTRON_VERSION", "trim string")
+    electron_version = read_file("VERSION", "trim string")
    extra_substitutions = [
      "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework",
      "ELECTRON_VERSION=$electron_version",
@@ -590,7 +558,6 @@ if (is_mac) {
    sources = filenames.framework_sources

    libs = [
-      "AVFoundation.framework",
      "Carbon.framework",
      "QuartzCore.framework",
      "Quartz.framework",
@@ -618,9 +585,7 @@ if (is_mac) {
    output_name = electron_helper_name
    deps = [
      ":electron_framework+link",
-      "//sandbox/mac:seatbelt",
    ]
-    defines = [ "HELPER_EXECUTABLE" ]
    sources = filenames.app_sources
    include_dirs = [ "." ]
    info_plist = "atom/renderer/resources/mac/Info.plist"
@@ -629,12 +594,6 @@ if (is_mac) {
      "-rpath",
      "@executable_path/../../..",
    ]
-    if (is_component_build) {
-      ldflags += [
-        "-rpath",
-        "@executable_path/../../../../../..",
-      ]
-    }
  }

  bundle_data("electron_app_framework_bundle_data") {
@@ -676,44 +635,13 @@ if (is_mac) {
      "$root_out_dir/$electron_login_helper_name.app",
    ]
    outputs = [
-      "{{bundle_contents_dir}}/Library/LoginItems/{{source_file_part}}",
+      "{{bundle_contents_dir}}/Library/LoginItems",
    ]
  }

-  action("electron_app_lproj_dirs") {
-    outputs = []
-
-    foreach(locale, locales_as_mac_outputs) {
-      outputs += [ "$target_gen_dir/app_infoplist_strings/$locale.lproj" ]
-    }
-    script = "build/mac/make_locale_dirs.py"
-    args = rebase_path(outputs)
-  }
-
-  foreach(locale, locales_as_mac_outputs) {
-    bundle_data("electron_app_strings_${locale}_bundle_data") {
-      sources = [
-        "$target_gen_dir/app_infoplist_strings/$locale.lproj",
-      ]
-      outputs = [
-        "{{bundle_resources_dir}}/$locale.lproj",
-      ]
-      public_deps = [
-        ":electron_app_lproj_dirs",
-      ]
-    }
-  }
-  group("electron_app_strings_bundle_data") {
-    public_deps = []
-    foreach(locale, locales_as_mac_outputs) {
-      public_deps += [ ":electron_app_strings_${locale}_bundle_data" ]
-    }
-  }
-
  bundle_data("electron_app_resources") {
    public_deps = [
      ":app2asar",
-      ":electron_app_strings_bundle_data",
      ":js2asar",
    ]
    sources = [
@@ -822,16 +750,6 @@ if (is_mac) {
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-string-l1-1-0.dll",
      ]
-
-      # This is to support renaming of electron.exe. node-gyp has hard-coded
-      # executable names which it will recognise as node. This module definition
-      # file claims that the electron executable is in fact named "node.exe",
-      # which is one of the executable names that node-gyp recognizes.
-      # See https://github.com/nodejs/node-gyp/commit/52ceec3a6d15de3a8f385f43dbe5ecf5456ad07a
-      ldflags += [ "/DEF:" + rebase_path("build/electron.def", root_build_dir) ]
-      inputs = [
-        "build/electron.def",
-      ]
    }
    if (is_linux) {
      ldflags = [ "-pie" ]
@@ -843,6 +761,72 @@ if (is_mac) {
  }
 }

+group("electron_tests") {
+  testonly = true
+
+  deps = [
+    ":chromium_browsertests",
+    ":chromium_unittests",
+  ]
+}
+
+group("chromium_unittests") {
+  testonly = true
+
+  deps = [
+    "//base:base_unittests",
+    "//cc:cc_unittests",
+    "//content/test:content_unittests",
+    "//crypto:crypto_unittests",
+    "//device:device_unittests",
+    "//gin:gin_unittests",
+    "//gpu:gpu_unittests",
+    "//ipc:ipc_tests",
+    "//media:media_unittests",
+    "//media/capture:capture_unittests",
+    "//media/midi:midi_unittests",
+    "//media/mojo:media_mojo_unittests",
+    "//mojo:mojo_unittests",
+    "//net:net_unittests",
+    "//ppapi:ppapi_unittests",
+    "//printing:printing_unittests",
+    "//skia:skia_unittests",
+    "//sql:sql_unittests",
+    "//storage:storage_unittests",
+    "//third_party/angle/src/tests:angle_unittests",
+    "//third_party/blink/public:all_blink",
+    "//third_party/blink/public:test_support",
+    "//third_party/leveldatabase:env_chromium_unittests",
+    "//ui/base:ui_base_unittests",
+    "//ui/compositor:compositor_unittests",
+    "//ui/display:display_unittests",
+    "//ui/events:events_unittests",
+    "//ui/gl:gl_unittests",
+    "//url:url_unittests",
+    "//url/ipc:url_ipc_unittests",
+    "//v8/test/unittests:unittests",
+  ]
+
+  if (is_linux) {
+    deps += [
+      "//net:disk_cache_memory_test",
+      "//sandbox/linux:sandbox_linux_unittests",
+    ]
+
+    if (use_dbus) {
+      deps += [ "//dbus:dbus_unittests" ]
+    }
+  }
+}
+
+group("chromium_browsertests") {
+  testonly = true
+
+  deps = [
+    "//content/test:content_browsertests",
+  ]
+}
+
 template("dist_zip") {
  _runtime_deps_target = "${target_name}__deps"
  _runtime_deps_file =
@@ -901,7 +885,7 @@ group("licenses") {

 copy("electron_version") {
  sources = [
-    "ELECTRON_VERSION",
+    "VERSION",
  ]
  outputs = [
    "$root_build_dir/version",
@@ -941,7 +925,6 @@ dist_zip("electron_chromedriver_zip") {
 dist_zip("electron_mksnapshot_zip") {
  data_deps = [
    "//v8:mksnapshot($v8_snapshot_toolchain)",
-    "//tools/v8_context_snapshot:v8_context_snapshot_generator",
    ":licenses",
  ]
  outputs = [
@@ -950,7 +933,7 @@ dist_zip("electron_mksnapshot_zip") {
 }

 group("electron") {
-  public_deps = [
+  deps = [
    ":electron_app",
  ]
 }
@@ -965,13 +948,6 @@ group("electron_content_manifest_overlays") {
 service_manifest("electron_content_packaged_services_manifest_overlay") {
  source = "//electron/manifests/electron_content_packaged_services_manifest_overlay.json"
  packaged_services = [ "//services/proxy_resolver:proxy_resolver_manifest" ]
-
-  if (enable_basic_printing) {
-    packaged_services += [
-      "//chrome/services/printing:manifest",
-      "//components/services/pdf_compositor:pdf_compositor_manifest",
-    ]
-  }
 }

 service_manifest("electron_content_browser_manifest_overlay") {
--- a/38
+++ b/38
@@ -10,9 +10,9 @@ gclient_gn_args = [

 vars = {
  'chromium_version':
-    '72.0.3626.52',
+    '69.0.3497.106',
  'node_version':
-    'ad2c89ec3be0f5db3ea02b0f591d36a5d84c51ad',
+    '5654c276d0497ff9a0bb0d7550b9073b2e2e7d3f',

  'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b',
  'pyyaml_version': '3.12',
@@ -30,13 +30,6 @@ vars = {
  # Python interface to Amazon Web Services. Is used for releases only.
  'checkout_boto': False,

-  # To allow in-house builds to checkout those manually.
-  'checkout_chromium': True,
-  'checkout_node': True,
-
-  # It's only needed to parse the native tests configurations.
-  'checkout_pyyaml': False,
-
  # Python "requests" module is used for releases only.
  'checkout_requests': False,

@@ -59,18 +52,12 @@ vars = {
 }

 deps = {
-  'src': {
-    'url': (Var("chromium_git")) + '/chromium/src.git@' + (Var("chromium_version")),
-    'condition': 'checkout_chromium',
-  },
-  'src/third_party/electron_node': {
-    'url': (Var("electron_git")) + '/node.git@' + (Var("node_version")),
-    'condition': 'checkout_node',
-  },
-  'src/electron/vendor/pyyaml': {
-    'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
-    'condition': 'checkout_pyyaml',
-  },
+  'src':
+    (Var("chromium_git")) + '/chromium/src.git@' + (Var("chromium_version")),
+  'src/third_party/electron_node':
+    (Var("electron_git")) + '/node.git@' + (Var("node_version")),
+  'src/electron/vendor/pyyaml':
+    (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
  'src/electron/vendor/boto': {
    'url': Var('boto_git') + '/boto.git' + '@' +  Var('boto_version'),
    'condition': 'checkout_boto',
@@ -84,12 +71,13 @@ deps = {
 hooks = [
  {
    'name': 'patch_chromium',
-    'condition': 'checkout_chromium and apply_patches',
+    'condition': 'apply_patches',
    'pattern': 'src/electron',
    'action': [
      'python',
-      'src/electron/script/apply_all_patches.py',
-      'src/electron/patches/common/config.json',
+      'src/electron/script/apply-patches',
+      '--project-root=.',
+      '--commit',
    ],
  },
  {
@@ -99,6 +87,8 @@ hooks = [
    'action': [
      'python',
      'src/electron/script/update-external-binaries.py',
+      '--root-url=http://github.com/electron/electron-frameworks/releases/download',
+      '--version=v1.4.0',
    ],
  },
  {
--- a/1
+++ b/1
@@ -1 +0,0 @@
-5.0.0-beta.2
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2019 GitHub Inc.
+Copyright (c) 2013-2018 GitHub Inc.

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@

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

--- a/1
+++ b/1
@@ -0,0 +1 @@
+4.0.0-beta.2
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,28 +1,3 @@
-# The config expects the following environment variables to be set:
-#  - "GN_CONFIG" Build type. One of {'debug', 'testing', 'release'}.
-#  - "GN_EXTRA_ARGS" Additional gn arguments for a build config,
-#      e.g. 'target_cpu="x86"' to build for a 32bit platform.
-#      https://gn.googlesource.com/gn/+/master/docs/reference.md#target_cpu
-#      Don't forget to set up "NPM_CONFIG_ARCH" and "TARGET_ARCH" accordningly
-#      if you pass a custom value for 'target_cpu'.
-#  - "ELECTRON_RELEASE" Set it to '1' upload binaries on success.
-#  - "NPM_CONFIG_ARCH" E.g. 'x86'. Is used to build native Node.js modules.
-#      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "TARGET_ARCH" value.
-#  - "TARGET_ARCH" Choose from {'ia32', 'x64', 'arm', 'arm64', 'mips64el'}.
-#      Is used in some publishing scripts, but does NOT affect the Electron binary.
-#      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "NPM_CONFIG_ARCH" value.
-#  - "UPLOAD_TO_S3" Set it to '1' upload a release to the S3 bucket.
-#      Otherwise the release will be uploaded to the Github Releases.
-#      (The value is only checked if "ELECTRON_RELEASE" is defined.)
-#
-# The publishing scripts expect access tokens to be defined as env vars,
-# but those are not covered here.
-#
-# AppVeyor docs on variables:
-# https://www.appveyor.com/docs/environment-variables/
-# https://www.appveyor.com/docs/build-configuration/#secure-variables
-# https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
-
 version: 1.0.{build}
 build_cloud: libcc-20
 image: libcc-20-vs2017-15.7.4
@@ -54,8 +29,7 @@ build_script:
      "https://github.com/electron/electron"
  - 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 gen out/Default "--args=import(\"//electron/build/args/%GN_CONFIG%.gn\") %GN_EXTRA_ARGS%"
  - 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
@@ -70,7 +44,7 @@ build_script:
      if ($env:GN_CONFIG -eq 'release') {
        ninja -C out/Default third_party/breakpad:dump_syms
      }
-  - if "%GN_CONFIG%"=="release" ( python electron\script\dump-symbols.py -d %cd%\out\Default\breakpad_symbols -v)
+  - if "%GN_CONFIG%"=="release" ( python electron\script\dump-symbols.py -d %cd%\out\Default\electron.breakpad.syms -v)
  - ps: >-
      if ($env:GN_CONFIG -eq 'release') {
        python electron\script\zip-symbols.py
@@ -81,6 +55,7 @@ test_script:
      if ((-Not (Test-Path Env:\ELECTRON_RELEASE)) -And ($env:GN_CONFIG -in "testing", "release")) {
        $env:RUN_TESTS="true"
      }
+  - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
  - ps: >-
      if ($env:RUN_TESTS -eq 'true') {
        New-Item .\out\Default\gen\node_headers\Release -Type directory
@@ -89,9 +64,8 @@ test_script:
        echo "Skipping tests for $env:GN_CONFIG build"
      }
  - cd electron
-  - if "%RUN_TESTS%"=="true" ( echo Running test suite & npm run test -- --ci --enable-logging)
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & npm run test -- --ci )
  - cd ..
-  - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
 deploy_script:
  - cd electron
  - ps: >-
--- a/atom/app/atom_content_client.cc
+++ b/atom/app/atom_content_client.cc
@@ -8,20 +8,19 @@
 #include <vector>

 #include "atom/common/atom_version.h"
+#include "atom/common/chrome_version.h"
 #include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/common/chrome_version.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/pepper_plugin_info.h"
 #include "content/public/common/user_agent.h"
 #include "electron/buildflags/buildflags.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "url/url_constants.h"
 // In SHARED_INTERMEDIATE_DIR.
 #include "widevine_cdm_version.h"  // NOLINT(build/include)
@@ -194,49 +193,19 @@ base::string16 AtomContentClient::GetLocalizedString(int message_id) const {
  return l10n_util::GetStringUTF16(message_id);
 }

-base::StringPiece AtomContentClient::GetDataResource(
-    int resource_id,
-    ui::ScaleFactor scale_factor) const {
-  return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
-      resource_id, scale_factor);
-}
-
-gfx::Image& AtomContentClient::GetNativeImageNamed(int resource_id) const {
-  return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      resource_id);
-}
-
-base::RefCountedMemory* AtomContentClient::GetDataResourceBytes(
-    int resource_id) const {
-  return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
-      resource_id);
-}
-
 void AtomContentClient::AddAdditionalSchemes(Schemes* schemes) {
+  schemes->standard_schemes.push_back("chrome-extension");
+
  std::vector<std::string> splited;
  ConvertStringWithSeparatorToVector(&splited, ",",
-                                     switches::kServiceWorkerSchemes);
+                                     switches::kRegisterServiceWorkerSchemes);
  for (const std::string& scheme : splited)
    schemes->service_worker_schemes.push_back(scheme);
  schemes->service_worker_schemes.push_back(url::kFileScheme);

-  ConvertStringWithSeparatorToVector(&splited, ",", switches::kStandardSchemes);
-  for (const std::string& scheme : splited)
-    schemes->standard_schemes.push_back(scheme);
-  schemes->standard_schemes.push_back("chrome-extension");
-
  ConvertStringWithSeparatorToVector(&splited, ",", switches::kSecureSchemes);
  for (const std::string& scheme : splited)
    schemes->secure_schemes.push_back(scheme);
-
-  ConvertStringWithSeparatorToVector(&splited, ",",
-                                     switches::kBypassCSPSchemes);
-  for (const std::string& scheme : splited)
-    schemes->csp_bypassing_schemes.push_back(scheme);
-
-  ConvertStringWithSeparatorToVector(&splited, ",", switches::kCORSSchemes);
-  for (const std::string& scheme : splited)
-    schemes->cors_enabled_schemes.push_back(scheme);
 }

 void AtomContentClient::AddPepperPlugins(
--- a/atom/app/atom_content_client.h
+++ b/atom/app/atom_content_client.h
@@ -9,11 +9,11 @@
 #include <string>
 #include <vector>

-#include "content/public/common/content_client.h"
+#include "brightray/common/content_client.h"

 namespace atom {

-class AtomContentClient : public content::ContentClient {
+class AtomContentClient : public brightray::ContentClient {
 public:
  AtomContentClient();
  ~AtomContentClient() override;
@@ -23,10 +23,6 @@ class AtomContentClient : public content::ContentClient {
  std::string GetProduct() const override;
  std::string GetUserAgent() const override;
  base::string16 GetLocalizedString(int message_id) const override;
-  base::StringPiece GetDataResource(int resource_id,
-                                    ui::ScaleFactor) const override;
-  gfx::Image& GetNativeImageNamed(int resource_id) const override;
-  base::RefCountedMemory* GetDataResourceBytes(int resource_id) const override;
  void AddAdditionalSchemes(Schemes* schemes) override;
  void AddPepperPlugins(
      std::vector<content::PepperPluginInfo>* plugins) override;
--- a/atom/app/atom_library_main.mm
+++ b/atom/app/atom_library_main.mm
@@ -7,11 +7,11 @@
 #include "atom/app/atom_main_delegate.h"
 #include "atom/app/node_main.h"
 #include "atom/common/atom_command_line.h"
-#include "atom/common/mac/main_application_bundle.h"
 #include "base/at_exit.h"
 #include "base/i18n/icu_util.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
+#include "brightray/common/mac/main_application_bundle.h"
 #include "content/public/app/content_main.h"

 int AtomMain(int argc, char* argv[]) {
@@ -28,7 +28,7 @@ int AtomInitializeICUandStartNode(int argc, char* argv[]) {
  base::AtExitManager atexit_manager;
  base::mac::ScopedNSAutoreleasePool pool;
  base::mac::SetOverrideFrameworkBundlePath(
-      atom::MainApplicationBundlePath()
+      brightray::MainApplicationBundlePath()
          .Append("Contents")
          .Append("Frameworks")
          .Append(ATOM_PRODUCT_NAME " Framework.framework"));
--- a/atom/app/atom_main.cc
+++ b/atom/app/atom_main.cc
@@ -5,7 +5,6 @@
 #include "atom/app/atom_main.h"

 #include <cstdlib>
-#include <memory>
 #include <vector>

 #if defined(OS_WIN)
@@ -25,15 +24,10 @@
 #include "base/win/windows_version.h"
 #include "content/public/app/sandbox_helper_win.h"
 #include "sandbox/win/src/sandbox_types.h"
-#elif defined(OS_LINUX)  // defined(OS_WIN)
-#include <unistd.h>
-#include <cstdio>
+#elif defined(OS_LINUX)                   // defined(OS_WIN)
 #include "atom/app/atom_main_delegate.h"  // NOLINT
 #include "content/public/app/content_main.h"
 #else  // defined(OS_LINUX)
-#include <mach-o/dyld.h>
-#include <unistd.h>
-#include <cstdio>
 #include "atom/app/atom_library_main.h"
 #endif  // defined(OS_MACOSX)

@@ -43,17 +37,13 @@
 #include "base/i18n/icu_util.h"
 #include "electron/buildflags/buildflags.h"

-#if defined(HELPER_EXECUTABLE)
-#include "sandbox/mac/seatbelt_exec.h"  // nogncheck
-#endif                                  // defined(HELPER_EXECUTABLE)
-
 namespace {

 #if BUILDFLAG(ENABLE_RUN_AS_NODE)
 const char kRunAsNode[] = "ELECTRON_RUN_AS_NODE";
 #endif

-ALLOW_UNUSED_TYPE bool IsEnvSet(const char* name) {
+bool IsEnvSet(const char* name) {
 #if defined(OS_WIN)
  size_t required_size;
  getenv_s(&required_size, nullptr, 0, name);
@@ -64,25 +54,6 @@ ALLOW_UNUSED_TYPE bool IsEnvSet(const char* name) {
 #endif
 }

-#if defined(OS_POSIX)
-void FixStdioStreams() {
-  // libuv may mark stdin/stdout/stderr as close-on-exec, which interferes
-  // with chromium's subprocess spawning. As a workaround, we detect if these
-  // streams are closed on startup, and reopen them as /dev/null if necessary.
-  // Otherwise, an unrelated file descriptor will be assigned as stdout/stderr
-  // which may cause various errors when attempting to write to them.
-  //
-  // For details see https://github.com/libuv/libuv/issues/2062
-  struct stat st;
-  if (fstat(STDIN_FILENO, &st) < 0 && errno == EBADF)
-    ignore_result(freopen("/dev/null", "r", stdin));
-  if (fstat(STDOUT_FILENO, &st) < 0 && errno == EBADF)
-    ignore_result(freopen("/dev/null", "w", stdout));
-  if (fstat(STDERR_FILENO, &st) < 0 && errno == EBADF)
-    ignore_result(freopen("/dev/null", "w", stderr));
-}
-#endif
-
 }  // namespace

 #if defined(OS_WIN)
@@ -184,8 +155,6 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
 #elif defined(OS_LINUX)  // defined(OS_WIN)

 int main(int argc, char* argv[]) {
-  FixStdioStreams();
-
 #if BUILDFLAG(ENABLE_RUN_AS_NODE)
  if (IsEnvSet(kRunAsNode)) {
    base::i18n::InitializeICU();
@@ -205,43 +174,12 @@ int main(int argc, char* argv[]) {
 #else  // defined(OS_LINUX)

 int main(int argc, char* argv[]) {
-  FixStdioStreams();
-
 #if BUILDFLAG(ENABLE_RUN_AS_NODE)
  if (IsEnvSet(kRunAsNode)) {
    return AtomInitializeICUandStartNode(argc, argv);
  }
 #endif

-#if defined(HELPER_EXECUTABLE)
-  uint32_t exec_path_size = 0;
-  int rv = _NSGetExecutablePath(NULL, &exec_path_size);
-  if (rv != -1) {
-    fprintf(stderr, "_NSGetExecutablePath: get length failed\n");
-    abort();
-  }
-
-  std::unique_ptr<char[]> exec_path(new char[exec_path_size]);
-  rv = _NSGetExecutablePath(exec_path.get(), &exec_path_size);
-  if (rv != 0) {
-    fprintf(stderr, "_NSGetExecutablePath: get path failed\n");
-    abort();
-  }
-  sandbox::SeatbeltExecServer::CreateFromArgumentsResult seatbelt =
-      sandbox::SeatbeltExecServer::CreateFromArguments(exec_path.get(), argc,
-                                                       argv);
-  if (seatbelt.sandbox_required) {
-    if (!seatbelt.server) {
-      fprintf(stderr, "Failed to create seatbelt sandbox server.\n");
-      abort();
-    }
-    if (!seatbelt.server->InitializeSandbox()) {
-      fprintf(stderr, "Failed to initialize sandbox.\n");
-      abort();
-    }
-  }
-#endif
-
  return AtomMain(argc, argv);
 }

--- a/atom/app/atom_main_delegate.cc
+++ b/atom/app/atom_main_delegate.cc
@@ -8,13 +8,10 @@
 #include <memory>
 #include <string>

-#if defined(OS_LINUX)
-#include <glib.h>  // for g_setenv()
-#endif
-
 #include "atom/app/atom_content_client.h"
 #include "atom/browser/atom_browser_client.h"
 #include "atom/browser/relauncher.h"
+#include "atom/common/google_api_key.h"
 #include "atom/common/options_switches.h"
 #include "atom/renderer/atom_renderer_client.h"
 #include "atom/renderer/atom_sandboxed_renderer_client.h"
@@ -23,17 +20,12 @@
 #include "base/debug/stack_trace.h"
 #include "base/environment.h"
 #include "base/logging.h"
-#include "base/mac/bundle_locations.h"
-#include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/common/content_switches.h"
-#include "electron/buildflags/buildflags.h"
 #include "ipc/ipc_buildflags.h"
-#include "services/service_manager/embedder/switches.h"
 #include "services/service_manager/sandbox/switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_switches.h"

 #if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
 #define IPC_MESSAGE_MACROS_LOG_ENABLED
@@ -58,25 +50,6 @@ bool IsBrowserProcess(base::CommandLine* cmd) {
  return process_type.empty();
 }

-// Returns true if this subprocess type needs the ResourceBundle initialized
-// and resources loaded.
-bool SubprocessNeedsResourceBundle(const std::string& process_type) {
-  return
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-      // The zygote process opens the resources for the renderers.
-      process_type == service_manager::switches::kZygoteProcess ||
-#endif
-#if defined(OS_MACOSX)
-      // Mac needs them too for scrollbar related images and for sandbox
-      // profiles.
-      process_type == ::switches::kPpapiPluginProcess ||
-      process_type == ::switches::kPpapiBrokerProcess ||
-      process_type == ::switches::kGpuProcess ||
-#endif
-      process_type == ::switches::kRendererProcess ||
-      process_type == ::switches::kUtilityProcess;
-}
-
 #if defined(OS_WIN)
 void InvalidParameterHandler(const wchar_t*,
                             const wchar_t*,
@@ -89,37 +62,6 @@ void InvalidParameterHandler(const wchar_t*,

 }  // namespace

-void LoadResourceBundle(const std::string& locale) {
-  const bool initialized = ui::ResourceBundle::HasSharedInstance();
-  if (initialized)
-    ui::ResourceBundle::CleanupSharedInstance();
-
-  // Load other resource files.
-  base::FilePath pak_dir;
-#if defined(OS_MACOSX)
-  pak_dir =
-      base::mac::FrameworkBundlePath().Append(FILE_PATH_LITERAL("Resources"));
-#else
-  base::PathService::Get(base::DIR_MODULE, &pak_dir);
-#endif
-
-  ui::ResourceBundle::InitSharedInstanceWithLocale(
-      locale, nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
-  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  bundle.ReloadLocaleResources(locale);
-  bundle.AddDataPackFromPath(pak_dir.Append(FILE_PATH_LITERAL("resources.pak")),
-                             ui::SCALE_FACTOR_NONE);
-#if BUILDFLAG(ENABLE_PDF_VIEWER)
-  NOTIMPLEMENTED()
-      << "Hi, whoever's fixing PDF support! Thanks! The pdf "
-         "viewer resources haven't been ported over to the GN build yet, so "
-         "you'll probably need to change this bit of code.";
-  bundle.AddDataPackFromPath(
-      pak_dir.Append(FILE_PATH_LITERAL("pdf_viewer_resources.pak")),
-      ui::GetSupportedScaleFactors()[0]);
-#endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
-}
-
 AtomMainDelegate::AtomMainDelegate() {}

 AtomMainDelegate::~AtomMainDelegate() {}
@@ -159,19 +101,23 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
  // Logging with pid and timestamp.
  logging::SetLogItems(true, false, true, false);

-  // Enable convient stack printing. This is enabled by default in non-official
-  // builds.
-  if (env->HasVar("ELECTRON_ENABLE_STACK_DUMPING"))
+  // Enable convient stack printing.
+#if defined(DEBUG) && defined(OS_LINUX)
+  bool enable_stack_dumping = true;
+#else
+  bool enable_stack_dumping = env->HasVar("ELECTRON_ENABLE_STACK_DUMPING");
+#endif
+#if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
+  // For 32bit ARM enabling stack printing would end up crashing.
+  // https://github.com/electron/electron/pull/11230#issuecomment-363232482
+  enable_stack_dumping = false;
+#endif
+  if (enable_stack_dumping)
    base::debug::EnableInProcessStackDumping();

-  if (env->HasVar("ELECTRON_DISABLE_SANDBOX"))
-    command_line->AppendSwitch(service_manager::switches::kNoSandbox);
-
  chrome::RegisterPathProvider();

 #if defined(OS_MACOSX)
-  OverrideChildProcessPath();
-  OverrideFrameworkBundlePath();
  SetUpBundleOverrides();
 #endif

@@ -183,63 +129,29 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
  base::win::DisableHandleVerifier();
 #endif

-  content_client_ = std::make_unique<AtomContentClient>();
-  SetContentClient(content_client_.get());
-
-  return false;
-}
-
-void AtomMainDelegate::PostEarlyInitialization(bool is_running_tests) {
-  std::string custom_locale;
-  ui::ResourceBundle::InitSharedInstanceWithLocale(
-      custom_locale, nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
-  auto* cmd_line = base::CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(::switches::kLang)) {
-    const std::string locale = cmd_line->GetSwitchValueASCII(::switches::kLang);
-    const base::FilePath locale_file_path =
-        ui::ResourceBundle::GetSharedInstance().GetLocaleFilePath(locale, true);
-    if (!locale_file_path.empty()) {
-      custom_locale = locale;
-#if defined(OS_LINUX)
-      /* When built with USE_GLIB, libcc's GetApplicationLocaleInternal() uses
-       * glib's g_get_language_names(), which keys off of getenv("LC_ALL") */
-      g_setenv("LC_ALL", custom_locale.c_str(), TRUE);
-#endif
-    }
-  }
-
-#if defined(OS_MACOSX)
-  if (custom_locale.empty())
-    l10n_util::OverrideLocaleWithCocoaLocale();
-#endif
-
-  LoadResourceBundle(custom_locale);
-
-  AtomBrowserClient::SetApplicationLocale(
-      l10n_util::GetApplicationLocale(custom_locale));
+  return brightray::MainDelegate::BasicStartupComplete(exit_code);
 }

 void AtomMainDelegate::PreSandboxStartup() {
+  brightray::MainDelegate::PreSandboxStartup();
+
  auto* command_line = base::CommandLine::ForCurrentProcess();

-  std::string process_type =
-      command_line->GetSwitchValueASCII(::switches::kProcessType);
-
-  // Initialize ResourceBundle which handles files loaded from external
-  // sources. The language should have been passed in to us from the
-  // browser process as a command line flag.
-  if (SubprocessNeedsResourceBundle(process_type)) {
-    std::string locale = command_line->GetSwitchValueASCII(::switches::kLang);
-    LoadResourceBundle(locale);
-  }
-
  // Only append arguments for browser process.
  if (!IsBrowserProcess(command_line))
    return;

-  // Disable setuid sandbox since it is not longer required on
-  // linux (namespace sandbox is available on most distros).
-  command_line->AppendSwitch(service_manager::switches::kDisableSetuidSandbox);
+  if (!command_line->HasSwitch(switches::kEnableMixedSandbox)) {
+    if (command_line->HasSwitch(switches::kEnableSandbox)) {
+      // Disable setuid sandbox since it is not longer required on
+      // linux(namespace sandbox is available on most distros).
+      command_line->AppendSwitch(
+          service_manager::switches::kDisableSetuidSandbox);
+    } else {
+      // Disable renderer sandbox for most of node's functions.
+      command_line->AppendSwitch(service_manager::switches::kNoSandbox);
+    }
+  }

  // Allow file:// URIs to read other file:// URIs by default.
  command_line->AppendSwitch(::switches::kAllowFileAccessFromFiles);
@@ -250,7 +162,7 @@ void AtomMainDelegate::PreSandboxStartup() {
 #endif
 }

-void AtomMainDelegate::PreCreateMainMessageLoop() {
+void AtomMainDelegate::PreContentInitialization() {
 #if defined(OS_MACOSX)
  RegisterAtomCrApp();
 #endif
@@ -300,12 +212,9 @@ bool AtomMainDelegate::DelaySandboxInitialization(
 }
 #endif

-bool AtomMainDelegate::ShouldLockSchemeRegistry() {
-  return false;
-}
-
-bool AtomMainDelegate::ShouldCreateFeatureList() {
-  return false;
+std::unique_ptr<brightray::ContentClient>
+AtomMainDelegate::CreateContentClient() {
+  return std::make_unique<AtomContentClient>();
 }

 }  // namespace atom
--- a/atom/app/atom_main_delegate.h
+++ b/atom/app/atom_main_delegate.h
@@ -8,14 +8,12 @@
 #include <memory>
 #include <string>

-#include "content/public/app/content_main_delegate.h"
-#include "content/public/common/content_client.h"
+#include "brightray/common/content_client.h"
+#include "brightray/common/main_delegate.h"

 namespace atom {

-void LoadResourceBundle(const std::string& locale);
-
-class AtomMainDelegate : public content::ContentMainDelegate {
+class AtomMainDelegate : public brightray::MainDelegate {
 public:
  AtomMainDelegate();
  ~AtomMainDelegate() override;
@@ -24,8 +22,7 @@ class AtomMainDelegate : public content::ContentMainDelegate {
  // content::ContentMainDelegate:
  bool BasicStartupComplete(int* exit_code) override;
  void PreSandboxStartup() override;
-  void PreCreateMainMessageLoop() override;
-  void PostEarlyInitialization(bool is_running_tests) override;
+  void PreContentInitialization() override;
  content::ContentBrowserClient* CreateContentBrowserClient() override;
  content::ContentRendererClient* CreateContentRendererClient() override;
  content::ContentUtilityClient* CreateContentUtilityClient() override;
@@ -36,18 +33,20 @@ class AtomMainDelegate : public content::ContentMainDelegate {
  bool ShouldSendMachPort(const std::string& process_type) override;
  bool DelaySandboxInitialization(const std::string& process_type) override;
 #endif
-  bool ShouldLockSchemeRegistry() override;
-  bool ShouldCreateFeatureList() override;
+
+  // brightray::MainDelegate:
+  std::unique_ptr<brightray::ContentClient> CreateContentClient() override;
+#if defined(OS_MACOSX)
+  void OverrideChildProcessPath() override;
+  void OverrideFrameworkBundlePath() override;
+#endif

 private:
 #if defined(OS_MACOSX)
-  void OverrideChildProcessPath();
-  void OverrideFrameworkBundlePath();
  void SetUpBundleOverrides();
 #endif

  std::unique_ptr<content::ContentBrowserClient> browser_client_;
-  std::unique_ptr<content::ContentClient> content_client_;
  std::unique_ptr<content::ContentRendererClient> renderer_client_;
  std::unique_ptr<content::ContentUtilityClient> utility_client_;

--- a/atom/app/atom_main_delegate_mac.mm
+++ b/atom/app/atom_main_delegate_mac.mm
@@ -5,8 +5,6 @@
 #include "atom/app/atom_main_delegate.h"

 #include "atom/browser/mac/atom_application.h"
-#include "atom/common/application_info.h"
-#include "atom/common/mac/main_application_bundle.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/mac/bundle_locations.h"
@@ -14,6 +12,8 @@
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/path_service.h"
 #include "base/strings/sys_string_conversions.h"
+#include "brightray/common/application_info.h"
+#include "brightray/common/mac/main_application_bundle.h"
 #include "content/public/common/content_paths.h"

 namespace atom {
@@ -21,7 +21,9 @@ namespace atom {
 namespace {

 base::FilePath GetFrameworksPath() {
-  return MainApplicationBundlePath().Append("Contents").Append("Frameworks");
+  return brightray::MainApplicationBundlePath()
+      .Append("Contents")
+      .Append("Frameworks");
 }

 base::FilePath GetHelperAppPath(const base::FilePath& frameworks_path,
@@ -44,7 +46,8 @@ void AtomMainDelegate::OverrideChildProcessPath() {
  base::FilePath helper_path =
      GetHelperAppPath(frameworks_path, ATOM_PRODUCT_NAME);
  if (!base::PathExists(helper_path))
-    helper_path = GetHelperAppPath(frameworks_path, GetApplicationName());
+    helper_path =
+        GetHelperAppPath(frameworks_path, brightray::GetApplicationName());
  if (!base::PathExists(helper_path))
    LOG(FATAL) << "Unable to find helper app";
  base::PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
@@ -52,7 +55,7 @@ void AtomMainDelegate::OverrideChildProcessPath() {

 void AtomMainDelegate::SetUpBundleOverrides() {
  base::mac::ScopedNSAutoreleasePool pool;
-  NSBundle* bundle = MainApplicationBundle();
+  NSBundle* bundle = brightray::MainApplicationBundle();
  std::string base_bundle_id =
      base::SysNSStringToUTF8([bundle bundleIdentifier]);
  NSString* team_id = [bundle objectForInfoDictionaryKey:@"ElectronTeamID"];
--- a/atom/app/node_main.cc
+++ b/atom/app/node_main.cc
@@ -16,7 +16,7 @@
 #include "atom/common/node_bindings.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
-#include "base/task/task_scheduler/task_scheduler.h"
+#include "base/task_scheduler/task_scheduler.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "gin/array_buffer.h"
 #include "gin/public/isolate_holder.h"
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -13,7 +13,6 @@
 #include "atom/browser/api/gpuinfo_manager.h"
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/atom_browser_main_parts.h"
-#include "atom/browser/atom_paths.h"
 #include "atom/browser/login_handler.h"
 #include "atom/browser/relauncher.h"
 #include "atom/common/atom_command_line.h"
@@ -24,13 +23,16 @@
 #include "atom/common/native_mate_converters/net_converter.h"
 #include "atom/common/native_mate_converters/network_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
 #include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
-#include "base/system/sys_info.h"
+#include "base/strings/string_util.h"
+#include "base/sys_info.h"
+#include "brightray/browser/brightray_paths.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/common/chrome_paths.h"
@@ -47,23 +49,17 @@
 #include "native_mate/object_template_builder.h"
 #include "net/ssl/client_cert_identity.h"
 #include "net/ssl/ssl_cert_request_info.h"
+#include "services/network/public/cpp/network_switches.h"
 #include "services/service_manager/sandbox/switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"

-// 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"
 #endif

 #if defined(OS_MACOSX)
-#include <CoreFoundation/CoreFoundation.h>
 #include "atom/browser/ui/cocoa/atom_bundle_mover.h"
 #endif

@@ -394,15 +390,15 @@ IconLoader::IconSize GetIconSizeByString(const std::string& size) {
 // Return the path constant from string.
 int GetPathConstant(const std::string& name) {
  if (name == "appData")
-    return DIR_APP_DATA;
+    return brightray::DIR_APP_DATA;
  else if (name == "userData")
-    return DIR_USER_DATA;
+    return brightray::DIR_USER_DATA;
  else if (name == "cache")
-    return DIR_CACHE;
+    return brightray::DIR_CACHE;
  else if (name == "userCache")
-    return DIR_USER_CACHE;
+    return brightray::DIR_USER_CACHE;
  else if (name == "logs")
-    return DIR_APP_LOGS;
+    return brightray::DIR_APP_LOGS;
  else if (name == "home")
    return base::DIR_HOME;
  else if (name == "temp")
@@ -533,12 +529,18 @@ int ImportIntoCertStore(CertificateManagerModel* model,
 }
 #endif

-void OnIconDataAvailable(scoped_refptr<util::Promise> promise,
+void OnIconDataAvailable(v8::Isolate* isolate,
+                         const App::FileIconCallback& callback,
                         gfx::Image* icon) {
+  v8::Locker locker(isolate);
+  v8::HandleScope handle_scope(isolate);
+
  if (icon && !icon->IsEmpty()) {
-    promise->Resolve(*icon);
+    callback.Run(v8::Null(isolate), *icon);
  } else {
-    promise->RejectWithErrorMessage("Failed to get file icon.");
+    v8::Local<v8::String> error_message =
+        v8::String::NewFromUtf8(isolate, "Failed to get file icon.");
+    callback.Run(v8::Exception::Error(error_message), gfx::Image());
  }
 }

@@ -676,7 +678,7 @@ void App::OnLogin(scoped_refptr<LoginHandler> login_handler,
  content::WebContents* web_contents = login_handler->GetWebContents();
  if (web_contents) {
    prevent_default = Emit(
-        "login", WebContents::FromOrCreate(isolate(), web_contents),
+        "login", WebContents::CreateFrom(isolate(), web_contents),
        request_details, login_handler->auth_info(),
        base::Bind(&PassLoginInformation, base::RetainedRef(login_handler)));
  }
@@ -707,12 +709,9 @@ bool App::CanCreateWindow(
  content::WebContents* web_contents =
      content::WebContents::FromRenderFrameHost(opener);
  if (web_contents) {
-    auto api_web_contents = WebContents::From(isolate(), web_contents);
-    // No need to emit any event if the WebContents is not available in JS.
-    if (!api_web_contents.IsEmpty()) {
-      api_web_contents->OnCreateWindow(target_url, referrer, frame_name,
-                                       disposition, additional_features, body);
-    }
+    auto api_web_contents = WebContents::CreateFrom(isolate(), web_contents);
+    api_web_contents->OnCreateWindow(target_url, referrer, frame_name,
+                                     disposition, additional_features, body);
  }

  return false;
@@ -731,7 +730,7 @@ void App::AllowCertificateError(
  v8::Locker locker(isolate());
  v8::HandleScope handle_scope(isolate());
  bool prevent_default = Emit(
-      "certificate-error", WebContents::FromOrCreate(isolate(), web_contents),
+      "certificate-error", WebContents::CreateFrom(isolate(), web_contents),
      request_url, net::ErrorToString(cert_error), ssl_info.cert, callback);

  // Deny the certificate by default.
@@ -758,7 +757,7 @@ void App::SelectClientCertificate(

  bool prevent_default =
      Emit("select-client-certificate",
-           WebContents::FromOrCreate(isolate(), web_contents),
+           WebContents::CreateFrom(isolate(), web_contents),
           cert_request_info->host_and_port.ToString(), std::move(client_certs),
           base::Bind(&OnClientCertificateSelected, isolate(), shared_delegate,
                      shared_identities));
@@ -780,24 +779,24 @@ void App::OnGpuProcessCrashed(base::TerminationStatus status) {

 void App::BrowserChildProcessLaunchedAndConnected(
    const content::ChildProcessData& data) {
-  ChildProcessLaunched(data.process_type, data.GetProcess().Handle());
+  ChildProcessLaunched(data.process_type, data.handle);
 }

 void App::BrowserChildProcessHostDisconnected(
    const content::ChildProcessData& data) {
-  ChildProcessDisconnected(base::GetProcId(data.GetProcess().Handle()));
+  ChildProcessDisconnected(base::GetProcId(data.handle));
 }

 void App::BrowserChildProcessCrashed(
    const content::ChildProcessData& data,
    const content::ChildProcessTerminationInfo& info) {
-  ChildProcessDisconnected(base::GetProcId(data.GetProcess().Handle()));
+  ChildProcessDisconnected(base::GetProcId(data.handle));
 }

 void App::BrowserChildProcessKilled(
    const content::ChildProcessData& data,
    const content::ChildProcessTerminationInfo& info) {
-  ChildProcessDisconnected(base::GetProcId(data.GetProcess().Handle()));
+  ChildProcessDisconnected(base::GetProcId(data.handle));
 }

 void App::RenderProcessReady(content::RenderProcessHost* host) {
@@ -875,45 +874,6 @@ std::string App::GetLocale() {
  return g_browser_process->GetApplicationLocale();
 }

-std::string App::GetLocaleCountryCode() {
-  std::string region;
-#if defined(OS_WIN)
-  WCHAR locale_name[LOCALE_NAME_MAX_LENGTH] = {0};
-
-  if (GetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_SISO3166CTRYNAME,
-                      (LPWSTR)&locale_name,
-                      sizeof(locale_name) / sizeof(WCHAR)) ||
-      GetLocaleInfoEx(LOCALE_NAME_SYSTEM_DEFAULT, LOCALE_SISO3166CTRYNAME,
-                      (LPWSTR)&locale_name,
-                      sizeof(locale_name) / sizeof(WCHAR))) {
-    base::WideToUTF8(locale_name, wcslen(locale_name), &region);
-  }
-#elif defined(OS_MACOSX)
-  CFLocaleRef locale = CFLocaleCopyCurrent();
-  CFStringRef value = CFStringRef(
-      static_cast<CFTypeRef>(CFLocaleGetValue(locale, kCFLocaleCountryCode)));
-  const CFIndex kCStringSize = 128;
-  char temporaryCString[kCStringSize] = {0};
-  CFStringGetCString(value, temporaryCString, kCStringSize,
-                     kCFStringEncodingUTF8);
-  region = temporaryCString;
-#else
-  const char* locale_ptr = setlocale(LC_TIME, NULL);
-  if (!locale_ptr)
-    locale_ptr = setlocale(LC_NUMERIC, NULL);
-  if (locale_ptr) {
-    std::string locale = locale_ptr;
-    std::string::size_type rpos = locale.find('.');
-    if (rpos != std::string::npos)
-      locale = locale.substr(0, rpos);
-    rpos = locale.find('_');
-    if (rpos != std::string::npos && rpos + 1 < locale.size())
-      region = locale.substr(rpos + 1);
-  }
-#endif
-  return region.size() == 2 ? region : std::string();
-}
-
 void App::OnSecondInstance(const base::CommandLine::StringVector& cmd,
                           const base::FilePath& cwd) {
  Emit("second-instance", cmd, cwd);
@@ -930,7 +890,7 @@ bool App::RequestSingleInstanceLock() {
    return true;

  base::FilePath user_dir;
-  base::PathService::Get(DIR_USER_DATA, &user_dir);
+  base::PathService::Get(brightray::DIR_USER_DATA, &user_dir);

  auto cb = base::Bind(&App::OnSecondInstance, base::Unretained(this));

@@ -1016,14 +976,7 @@ bool App::IsAccessibilitySupportEnabled() {
  return ax_state->IsAccessibleBrowser();
 }

-void App::SetAccessibilitySupportEnabled(bool enabled, mate::Arguments* args) {
-  if (!Browser::Get()->is_ready()) {
-    args->ThrowError(
-        "app.setAccessibilitySupportEnabled() can only be called "
-        "after app is ready");
-    return;
-  }
-
+void App::SetAccessibilitySupportEnabled(bool enabled) {
  auto* ax_state = content::BrowserAccessibilityState::GetInstance();
  if (enabled) {
    ax_state->OnScreenReaderDetected();
@@ -1124,13 +1077,16 @@ JumpListResult App::SetJumpList(v8::Local<v8::Value> val,
 }
 #endif  // defined(OS_WIN)

-v8::Local<v8::Promise> App::GetFileIcon(const base::FilePath& path,
-                                        mate::Arguments* args) {
-  scoped_refptr<util::Promise> promise = new util::Promise(isolate());
+void App::GetFileIcon(const base::FilePath& path, mate::Arguments* args) {
+  mate::Dictionary options;
+  IconLoader::IconSize icon_size;
+  FileIconCallback callback;
+
+  v8::Locker locker(isolate());
+  v8::HandleScope handle_scope(isolate());
+
  base::FilePath normalized_path = path.NormalizePathSeparators();

-  IconLoader::IconSize icon_size;
-  mate::Dictionary options;
  if (!args->GetNext(&options)) {
    icon_size = IconLoader::IconSize::NORMAL;
  } else {
@@ -1139,17 +1095,22 @@ v8::Local<v8::Promise> App::GetFileIcon(const base::FilePath& path,
    icon_size = GetIconSizeByString(icon_size_string);
  }

+  if (!args->GetNext(&callback)) {
+    args->ThrowError("Missing required callback function");
+    return;
+  }
+
  auto* icon_manager = AtomBrowserMainParts::Get()->GetIconManager();
  gfx::Image* icon =
      icon_manager->LookupIconFromFilepath(normalized_path, icon_size);
  if (icon) {
-    promise->Resolve(*icon);
+    callback.Run(v8::Null(isolate()), *icon);
  } else {
-    icon_manager->LoadIcon(normalized_path, icon_size,
-                           base::Bind(&OnIconDataAvailable, promise),
-                           &cancelable_task_tracker_);
+    icon_manager->LoadIcon(
+        normalized_path, icon_size,
+        base::Bind(&OnIconDataAvailable, isolate(), callback),
+        &cancelable_task_tracker_);
  }
-  return promise->GetHandle();
 }

 std::vector<mate::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
@@ -1212,7 +1173,7 @@ v8::Local<v8::Promise> App::GetGPUInfo(v8::Isolate* isolate,

  auto* const info_mgr = GPUInfoManager::GetInstance();
  if (info_type == "complete") {
-#if defined(OS_WIN) || defined(OS_MACOSX)
+#if defined(OS_WIN)
    info_mgr->FetchCompleteInfo(promise);
 #else
    info_mgr->FetchBasicInfo(promise);
@@ -1250,6 +1211,19 @@ void App::EnableSandbox(mate::Arguments* args) {
  command_line->AppendSwitch(switches::kEnableSandbox);
 }

+void App::EnableMixedSandbox(mate::Arguments* args) {
+  if (Browser::Get()->is_ready()) {
+    args->ThrowError(
+        "app.enableMixedSandbox() can only be called "
+        "before app is ready");
+    return;
+  }
+
+  auto* command_line = base::CommandLine::ForCurrentProcess();
+  RemoveNoSandboxSwitch(command_line);
+  command_line->AppendSwitch(switches::kEnableMixedSandbox);
+}
+
 #if defined(OS_MACOSX)
 bool App::MoveToApplicationsFolder(mate::Arguments* args) {
  return ui::cocoa::AtomBundleMover::Move(args);
@@ -1308,15 +1282,8 @@ void App::BuildPrototype(v8::Isolate* isolate,
                 base::Bind(&Browser::InvalidateCurrentActivity, browser))
      .SetMethod("updateCurrentActivity",
                 base::Bind(&Browser::UpdateCurrentActivity, browser))
-      // TODO(juturu): Remove in 2.0, deprecate before then with warnings
-      .SetMethod("moveToApplicationsFolder", &App::MoveToApplicationsFolder)
-      .SetMethod("isInApplicationsFolder", &App::IsInApplicationsFolder)
-#endif
-#if defined(OS_MACOSX) || defined(OS_LINUX)
      .SetMethod("setAboutPanelOptions",
                 base::Bind(&Browser::SetAboutPanelOptions, browser))
-      .SetMethod("showAboutPanel",
-                 base::Bind(&Browser::ShowAboutPanel, browser))
 #endif
 #if defined(OS_WIN)
      .SetMethod("setUserTasks", base::Bind(&Browser::SetUserTasks, browser))
@@ -1333,7 +1300,6 @@ void App::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("getPath", &App::GetPath)
      .SetMethod("setDesktopName", &App::SetDesktopName)
      .SetMethod("getLocale", &App::GetLocale)
-      .SetMethod("getLocaleCountryCode", &App::GetLocaleCountryCode)
 #if defined(USE_NSS_CERTS)
      .SetMethod("importCertificate", &App::ImportCertificate)
 #endif
@@ -1353,11 +1319,17 @@ void App::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("getAppMetrics", &App::GetAppMetrics)
      .SetMethod("getGPUFeatureStatus", &App::GetGPUFeatureStatus)
      .SetMethod("getGPUInfo", &App::GetGPUInfo)
+// TODO(juturu): Remove in 2.0, deprecate before then with warnings
+#if defined(OS_MACOSX)
+      .SetMethod("moveToApplicationsFolder", &App::MoveToApplicationsFolder)
+      .SetMethod("isInApplicationsFolder", &App::IsInApplicationsFolder)
+#endif
 #if defined(MAS_BUILD)
      .SetMethod("startAccessingSecurityScopedResource",
                 &App::StartAccessingSecurityScopedResource)
 #endif
-      .SetMethod("enableSandbox", &App::EnableSandbox);
+      .SetMethod("enableSandbox", &App::EnableSandbox)
+      .SetMethod("enableMixedSandbox", &App::EnableMixedSandbox);
 }

 }  // namespace api
@@ -1366,6 +1338,25 @@ void App::BuildPrototype(v8::Isolate* isolate,

 namespace {

+void AppendSwitch(const std::string& switch_string, mate::Arguments* args) {
+  auto* command_line = base::CommandLine::ForCurrentProcess();
+
+  if (base::EndsWith(switch_string, "-path",
+                     base::CompareCase::INSENSITIVE_ASCII) ||
+      switch_string == network::switches::kLogNetLog) {
+    base::FilePath path;
+    args->GetNext(&path);
+    command_line->AppendSwitchPath(switch_string, path);
+    return;
+  }
+
+  std::string value;
+  if (args->GetNext(&value))
+    command_line->AppendSwitchASCII(switch_string, value);
+  else
+    command_line->AppendSwitch(switch_string);
+}
+
 #if defined(OS_MACOSX)
 int DockBounce(const std::string& type) {
  int request_id = -1;
@@ -1386,11 +1377,14 @@ void Initialize(v8::Local<v8::Object> exports,
                v8::Local<v8::Context> context,
                void* priv) {
  v8::Isolate* isolate = context->GetIsolate();
+  auto* command_line = base::CommandLine::ForCurrentProcess();
+
  mate::Dictionary dict(isolate, exports);
-  dict.Set("App", atom::api::App::GetConstructor(isolate)
-                      ->GetFunction(context)
-                      .ToLocalChecked());
+  dict.Set("App", atom::api::App::GetConstructor(isolate)->GetFunction());
  dict.Set("app", atom::api::App::Create(isolate));
+  dict.SetMethod("appendSwitch", &AppendSwitch);
+  dict.SetMethod("appendArgument", base::Bind(&base::CommandLine::AppendArg,
+                                              base::Unretained(command_line)));
 #if defined(OS_MACOSX)
  auto browser = base::Unretained(Browser::Get());
  dict.SetMethod("dockBounce", &DockBounce);
--- a/atom/browser/api/atom_api_app.h
+++ b/atom/browser/api/atom_api_app.h
@@ -182,7 +182,6 @@ class App : public AtomBrowserClient::Delegate,

  void SetDesktopName(const std::string& desktop_name);
  std::string GetLocale();
-  std::string GetLocaleCountryCode();
  void OnSecondInstance(const base::CommandLine::StringVector& cmd,
                        const base::FilePath& cwd);
  bool HasSingleInstanceLock() const;
@@ -192,20 +191,20 @@ class App : public AtomBrowserClient::Delegate,
  void DisableHardwareAcceleration(mate::Arguments* args);
  void DisableDomainBlockingFor3DAPIs(mate::Arguments* args);
  bool IsAccessibilitySupportEnabled();
-  void SetAccessibilitySupportEnabled(bool enabled, mate::Arguments* args);
+  void SetAccessibilitySupportEnabled(bool enabled);
  Browser::LoginItemSettings GetLoginItemSettings(mate::Arguments* args);
 #if defined(USE_NSS_CERTS)
  void ImportCertificate(const base::DictionaryValue& options,
                         const net::CompletionCallback& callback);
 #endif
-  v8::Local<v8::Promise> GetFileIcon(const base::FilePath& path,
-                                     mate::Arguments* args);
+  void GetFileIcon(const base::FilePath& path, mate::Arguments* args);

  std::vector<mate::Dictionary> GetAppMetrics(v8::Isolate* isolate);
  v8::Local<v8::Value> GetGPUFeatureStatus(v8::Isolate* isolate);
  v8::Local<v8::Promise> GetGPUInfo(v8::Isolate* isolate,
                                    const std::string& info_type);
  void EnableSandbox(mate::Arguments* args);
+  void EnableMixedSandbox(mate::Arguments* args);

 #if defined(OS_MACOSX)
  bool MoveToApplicationsFolder(mate::Arguments* args);
--- a/atom/browser/api/atom_api_auto_updater.cc
+++ b/atom/browser/api/atom_api_auto_updater.cc
@@ -147,9 +147,7 @@ void Initialize(v8::Local<v8::Object> exports,
  v8::Isolate* isolate = context->GetIsolate();
  mate::Dictionary dict(isolate, exports);
  dict.Set("autoUpdater", AutoUpdater::Create(isolate));
-  dict.Set("AutoUpdater", AutoUpdater::GetConstructor(isolate)
-                              ->GetFunction(context)
-                              .ToLocalChecked());
+  dict.Set("AutoUpdater", AutoUpdater::GetConstructor(isolate)->GetFunction());
 }

 }  // namespace
--- a/atom/browser/api/atom_api_browser_view.cc
+++ b/atom/browser/api/atom_api_browser_view.cc
@@ -66,7 +66,6 @@ void BrowserView::Init(v8::Isolate* isolate,

  web_contents_.Reset(isolate, web_contents.ToV8());
  api_web_contents_ = web_contents.get();
-  Observe(web_contents->web_contents());

  view_.reset(
      NativeBrowserView::Create(api_web_contents_->managed_web_contents()));
@@ -75,16 +74,7 @@ void BrowserView::Init(v8::Isolate* isolate,
 }

 BrowserView::~BrowserView() {
-  if (api_web_contents_) {  // destroy() is called
-    // Destroy WebContents asynchronously unless app is shutting down,
-    // because destroy() might be called inside WebContents's event handler.
-    api_web_contents_->DestroyWebContents(!Browser::Get()->is_shutting_down());
-  }
-}
-
-void BrowserView::WebContentsDestroyed() {
-  api_web_contents_ = nullptr;
-  web_contents_.Reset();
+  api_web_contents_->DestroyWebContents(true /* async */);
 }

 // static
@@ -159,9 +149,8 @@ void Initialize(v8::Local<v8::Object> exports,
  v8::Isolate* isolate = context->GetIsolate();
  BrowserView::SetConstructor(isolate, base::Bind(&BrowserView::New));

-  mate::Dictionary browser_view(isolate, BrowserView::GetConstructor(isolate)
-                                             ->GetFunction(context)
-                                             .ToLocalChecked());
+  mate::Dictionary browser_view(
+      isolate, BrowserView::GetConstructor(isolate)->GetFunction());
  browser_view.SetMethod("fromId",
                         &mate::TrackableObject<BrowserView>::FromWeakMapID);
  browser_view.SetMethod("getAllViews",
--- a/atom/browser/api/atom_api_browser_view.h
+++ b/atom/browser/api/atom_api_browser_view.h
@@ -10,7 +10,6 @@

 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/native_browser_view.h"
-#include "content/public/browser/web_contents_observer.h"
 #include "native_mate/handle.h"

 namespace gfx {
@@ -30,8 +29,7 @@ namespace api {

 class WebContents;

-class BrowserView : public mate::TrackableObject<BrowserView>,
-                    public content::WebContentsObserver {
+class BrowserView : public mate::TrackableObject<BrowserView> {
 public:
  static mate::WrappableBase* New(mate::Arguments* args);

@@ -49,9 +47,6 @@ class BrowserView : public mate::TrackableObject<BrowserView>,
              const mate::Dictionary& options);
  ~BrowserView() override;

-  // content::WebContentsObserver:
-  void WebContentsDestroyed() override;
-
 private:
  void Init(v8::Isolate* isolate,
            v8::Local<v8::Object> wrapper,
--- a/atom/browser/api/atom_api_browser_window.cc
+++ b/atom/browser/api/atom_api_browser_window.cc
@@ -20,7 +20,6 @@
 #include "content/browser/renderer_host/render_widget_host_impl.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"

@@ -75,6 +74,10 @@ BrowserWindow::BrowserWindow(v8::Isolate* isolate,
  mate::Dictionary(isolate, web_contents->GetWrapper())
      .Set("browserWindowOptions", options);

+  // Tell the content module to initialize renderer widget with transparent
+  // mode.
+  ui::GpuSwitchingManager::SetTransparent(window()->transparent());
+
  // Associate with BrowserWindow.
  web_contents->SetOwnerWindow(window());

@@ -182,14 +185,7 @@ bool BrowserWindow::OnMessageReceived(const IPC::Message& message,
 }

 void BrowserWindow::OnCloseContents() {
-  // On some machines it may happen that the window gets destroyed for twice,
-  // checking web_contents() can effectively guard against that.
-  // https://github.com/electron/electron/issues/16202.
-  //
-  // TODO(zcbenz): We should find out the root cause and improve the closing
-  // procedure of BrowserWindow.
-  if (!web_contents())
-    return;
+  DCHECK(web_contents());

  // Close all child windows before closing current window.
  v8::Locker locker(isolate());
@@ -238,7 +234,7 @@ void BrowserWindow::OnCloseButtonClicked(bool* prevent_default) {
    return;

  if (web_contents()->NeedToFireBeforeUnload())
-    web_contents()->DispatchBeforeUnload(false /* auto_cancel */);
+    web_contents()->DispatchBeforeUnload();
  else
    web_contents()->Close();
 }
@@ -311,29 +307,7 @@ void BrowserWindow::SetBackgroundColor(const std::string& color_name) {
 }

 void BrowserWindow::SetBrowserView(v8::Local<v8::Value> value) {
-  TopLevelWindow::ResetBrowserViews();
-  TopLevelWindow::AddBrowserView(value);
-#if defined(OS_MACOSX)
-  UpdateDraggableRegions(nullptr, draggable_regions_);
-#endif
-}
-
-void BrowserWindow::AddBrowserView(v8::Local<v8::Value> value) {
-  TopLevelWindow::AddBrowserView(value);
-#if defined(OS_MACOSX)
-  UpdateDraggableRegions(nullptr, draggable_regions_);
-#endif
-}
-
-void BrowserWindow::RemoveBrowserView(v8::Local<v8::Value> value) {
-  TopLevelWindow::RemoveBrowserView(value);
-#if defined(OS_MACOSX)
-  UpdateDraggableRegions(nullptr, draggable_regions_);
-#endif
-}
-
-void BrowserWindow::ResetBrowserViews() {
-  TopLevelWindow::ResetBrowserViews();
+  TopLevelWindow::SetBrowserView(value);
 #if defined(OS_MACOSX)
  UpdateDraggableRegions(nullptr, draggable_regions_);
 #endif
@@ -341,7 +315,7 @@ void BrowserWindow::ResetBrowserViews() {

 void BrowserWindow::SetVibrancy(v8::Isolate* isolate,
                                v8::Local<v8::Value> value) {
-  std::string type = gin::V8ToString(isolate, value);
+  std::string type = mate::V8ToString(value);

  auto* render_view_host = web_contents()->GetRenderViewHost();
  if (render_view_host) {
@@ -411,9 +385,7 @@ void BrowserWindow::Cleanup() {
  if (host)
    host->GetWidget()->RemoveInputEventObserver(this);

-  // Destroy WebContents asynchronously unless app is shutting down,
-  // because destroy() might be called inside WebContents's event handler.
-  api_web_contents_->DestroyWebContents(!Browser::Get()->is_shutting_down());
+  api_web_contents_->DestroyWebContents(true /* async */);
  Observe(nullptr);
 }

--- a/atom/browser/api/atom_api_browser_window.h
+++ b/atom/browser/api/atom_api_browser_window.h
@@ -72,9 +72,6 @@ class BrowserWindow : public TopLevelWindow,
  void Blur() override;
  void SetBackgroundColor(const std::string& color_name) override;
  void SetBrowserView(v8::Local<v8::Value> value) override;
-  void AddBrowserView(v8::Local<v8::Value> value) override;
-  void RemoveBrowserView(v8::Local<v8::Value> value) override;
-  void ResetBrowserViews() override;
  void SetVibrancy(v8::Isolate* isolate, v8::Local<v8::Value> value) override;

  // BrowserWindow APIs.
@@ -85,7 +82,7 @@ class BrowserWindow : public TopLevelWindow,

 private:
 #if defined(OS_MACOSX)
-  void OverrideNSWindowContentView(InspectableWebContents* iwc);
+  void OverrideNSWindowContentView(brightray::InspectableWebContents* iwc);
 #endif

  // Helpers.
--- a/atom/browser/api/atom_api_browser_window_mac.mm
+++ b/atom/browser/api/atom_api_browser_window_mac.mm
@@ -8,9 +8,9 @@

 #include "atom/browser/native_browser_view.h"
 #include "atom/browser/native_window_mac.h"
-#include "atom/browser/ui/inspectable_web_contents_view.h"
 #include "atom/common/draggable_region.h"
 #include "base/mac/scoped_nsobject.h"
+#include "brightray/browser/inspectable_web_contents_view.h"

@interface NSView (WebContentsView)
 - (void)setMouseDownCanMoveWindow:(BOOL)can_move;
@@ -55,20 +55,15 @@ std::vector<gfx::Rect> CalculateNonDraggableRegions(

 }  // namespace

-void BrowserWindow::OverrideNSWindowContentView(InspectableWebContents* iwc) {
+void BrowserWindow::OverrideNSWindowContentView(
+    brightray::InspectableWebContents* iwc) {
  // Make NativeWindow use a NSView as content view.
  static_cast<NativeWindowMac*>(window())->OverrideNSWindowContentView();
  // Add webview to contentView.
-  NSView* webView = iwc->GetView()->GetNativeView().GetNativeNSView();
-  NSView* contentView =
-      [window()->GetNativeWindow().GetNativeNSWindow() contentView];
+  NSView* webView = iwc->GetView()->GetNativeView();
+  NSView* contentView = [window()->GetNativeWindow() contentView];
  [webView setFrame:[contentView bounds]];
-
-  // ensure that buttons view is floated to top of view hierarchy
-  NSArray* subviews = [contentView subviews];
-  NSView* last = subviews.lastObject;
-  [contentView addSubview:webView positioned:NSWindowBelow relativeTo:last];
-
+  [contentView addSubview:webView];
  [contentView viewDidMoveToWindow];
 }

@@ -81,7 +76,7 @@ void BrowserWindow::UpdateDraggableRegions(
  // All ControlRegionViews should be added as children of the WebContentsView,
  // because WebContentsView will be removed and re-added when entering and
  // leaving fullscreen mode.
-  NSView* webView = web_contents()->GetNativeView().GetNativeNSView();
+  NSView* webView = web_contents()->GetNativeView();
  NSInteger webViewWidth = NSWidth([webView bounds]);
  NSInteger webViewHeight = NSHeight([webView bounds]);

@@ -109,10 +104,8 @@ void BrowserWindow::UpdateDraggableRegions(
        DraggableRegionsToSkRegion(regions), webViewWidth, webViewHeight);
  }

-  auto browser_views = window_->browser_views();
-  for (NativeBrowserView* view : browser_views) {
-    (view)->UpdateDraggableRegions(drag_exclude_rects);
-  }
+  if (window_->browser_view())
+    window_->browser_view()->UpdateDraggableRegions(drag_exclude_rects);

  // Create and add a ControlRegionView for each region that needs to be
  // excluded from the dragging.
--- a/atom/browser/api/atom_api_content_tracing.cc
+++ b/atom/browser/api/atom_api_content_tracing.cc
@@ -7,8 +7,6 @@

 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
-#include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/promise_util.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "content/public/browser/tracing_controller.h"
@@ -25,27 +23,15 @@ struct Converter<base::trace_event::TraceConfig> {
  static bool FromV8(v8::Isolate* isolate,
                     v8::Local<v8::Value> val,
                     base::trace_event::TraceConfig* out) {
-    // (alexeykuzmin): A combination of "categoryFilter" and "traceOptions"
-    // has to be checked first because none of the fields
-    // in the `memory_dump_config` dict below are mandatory
-    // and we cannot check the config format.
    Dictionary options;
-    if (ConvertFromV8(isolate, val, &options)) {
-      std::string category_filter, trace_options;
-      if (options.Get("categoryFilter", &category_filter) &&
-          options.Get("traceOptions", &trace_options)) {
-        *out = base::trace_event::TraceConfig(category_filter, trace_options);
-        return true;
-      }
-    }
-
-    base::DictionaryValue memory_dump_config;
-    if (ConvertFromV8(isolate, val, &memory_dump_config)) {
-      *out = base::trace_event::TraceConfig(memory_dump_config);
-      return true;
-    }
-
-    return false;
+    if (!ConvertFromV8(isolate, val, &options))
+      return false;
+    std::string category_filter, trace_options;
+    if (!options.Get("categoryFilter", &category_filter) ||
+        !options.Get("traceOptions", &trace_options))
+      return false;
+    *out = base::trace_event::TraceConfig(category_filter, trace_options);
+    return true;
  }
 };

@@ -66,70 +52,26 @@ scoped_refptr<TracingController::TraceDataEndpoint> GetTraceDataEndpoint(
      result_file_path, base::Bind(callback, result_file_path));
 }

-void OnRecordingStopped(scoped_refptr<atom::util::Promise> promise,
-                        const base::FilePath& path) {
-  promise->Resolve(path);
-}
-
-v8::Local<v8::Promise> StopRecording(v8::Isolate* isolate,
-                                     const base::FilePath& path) {
-  scoped_refptr<atom::util::Promise> promise = new atom::util::Promise(isolate);
-
+void StopRecording(const base::FilePath& path,
+                   const CompletionCallback& callback) {
  TracingController::GetInstance()->StopTracing(
-      GetTraceDataEndpoint(path, base::Bind(&OnRecordingStopped, promise)));
-
-  return promise->GetHandle();
-}
-
-void OnCategoriesAvailable(scoped_refptr<atom::util::Promise> promise,
-                           const std::set<std::string>& categories) {
-  promise->Resolve(categories);
-}
-
-v8::Local<v8::Promise> GetCategories(v8::Isolate* isolate) {
-  scoped_refptr<atom::util::Promise> promise = new atom::util::Promise(isolate);
-  bool success = TracingController::GetInstance()->GetCategories(
-      base::BindOnce(&OnCategoriesAvailable, promise));
-
-  if (!success)
-    promise->RejectWithErrorMessage("Could not get categories.");
-
-  return promise->GetHandle();
-}
-
-void OnTracingStarted(scoped_refptr<atom::util::Promise> promise) {
-  promise->Resolve();
-}
-
-v8::Local<v8::Promise> StartTracing(
-    v8::Isolate* isolate,
-    const base::trace_event::TraceConfig& trace_config) {
-  scoped_refptr<atom::util::Promise> promise = new atom::util::Promise(isolate);
-
-  bool success = TracingController::GetInstance()->StartTracing(
-      trace_config, base::BindOnce(&OnTracingStarted, promise));
-
-  if (!success)
-    promise->RejectWithErrorMessage("Could not start tracing");
-
-  return promise->GetHandle();
-}
-
-bool GetTraceBufferUsage(
-    const base::RepeatingCallback<void(float, size_t)>& callback) {
-  return TracingController::GetInstance()->GetTraceBufferUsage(
-      base::BindOnce(callback));
+      GetTraceDataEndpoint(path, callback));
 }

 void Initialize(v8::Local<v8::Object> exports,
                v8::Local<v8::Value> unused,
                v8::Local<v8::Context> context,
                void* priv) {
+  auto controller = base::Unretained(TracingController::GetInstance());
  mate::Dictionary dict(context->GetIsolate(), exports);
-  dict.SetMethod("getCategories", &GetCategories);
-  dict.SetMethod("startRecording", &StartTracing);
+  dict.SetMethod("getCategories",
+                 base::Bind(&TracingController::GetCategories, controller));
+  dict.SetMethod("startRecording",
+                 base::Bind(&TracingController::StartTracing, controller));
  dict.SetMethod("stopRecording", &StopRecording);
-  dict.SetMethod("getTraceBufferUsage", &GetTraceBufferUsage);
+  dict.SetMethod(
+      "getTraceBufferUsage",
+      base::Bind(&TracingController::GetTraceBufferUsage, controller));
 }

 }  // namespace
--- a/atom/browser/api/atom_api_cookies.cc
+++ b/atom/browser/api/atom_api_cookies.cc
@@ -12,11 +12,9 @@
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "base/task/post_task.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "content/public/browser/browser_context.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
@@ -136,50 +134,32 @@ inline net::CookieStore* GetCookieStore(
  return getter->GetURLRequestContext()->cookie_store();
 }

-void ResolvePromiseWithCookies(scoped_refptr<util::Promise> promise,
-                               net::CookieList cookieList) {
-  promise->Resolve(cookieList);
-}
-
-void ResolvePromise(scoped_refptr<util::Promise> promise) {
-  promise->Resolve();
-}
-
-// Resolve |promise| in UI thread.
-void ResolvePromiseInUI(scoped_refptr<util::Promise> promise) {
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                           base::BindOnce(ResolvePromise, std::move(promise)));
-}
-
 // Run |callback| on UI thread.
 void RunCallbackInUI(const base::Closure& callback) {
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, callback);
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
 }

 // Remove cookies from |list| not matching |filter|, and pass it to |callback|.
 void FilterCookies(std::unique_ptr<base::DictionaryValue> filter,
-                   scoped_refptr<util::Promise> promise,
+                   const Cookies::GetCallback& callback,
                   const net::CookieList& list) {
  net::CookieList result;
  for (const auto& cookie : list) {
    if (MatchesCookie(filter.get(), cookie))
      result.push_back(cookie);
  }
-
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
-      base::BindOnce(ResolvePromiseWithCookies, std::move(promise), result));
+  RunCallbackInUI(base::Bind(callback, Cookies::SUCCESS, result));
 }

 // Receives cookies matching |filter| in IO thread.
 void GetCookiesOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
                    std::unique_ptr<base::DictionaryValue> filter,
-                    scoped_refptr<util::Promise> promise) {
+                    const Cookies::GetCallback& callback) {
  std::string url;
  filter->GetString("url", &url);

  auto filtered_callback =
-      base::Bind(FilterCookies, base::Passed(&filter), std::move(promise));
+      base::Bind(FilterCookies, base::Passed(&filter), callback);

  // Empty url will match all url cookies.
  if (url.empty())
@@ -190,42 +170,31 @@ void GetCookiesOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
 }

 // Removes cookie with |url| and |name| in IO thread.
-void RemoveCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
-                      const GURL& url,
-                      const std::string& name,
-                      scoped_refptr<util::Promise> promise) {
+void RemoveCookieOnIOThread(scoped_refptr<net::URLRequestContextGetter> getter,
+                            const GURL& url,
+                            const std::string& name,
+                            const base::Closure& callback) {
  GetCookieStore(getter)->DeleteCookieAsync(
-      url, name, base::BindOnce(ResolvePromiseInUI, promise));
-}
-
-// Resolves/rejects the |promise| in UI thread.
-void SettlePromiseInUI(scoped_refptr<util::Promise> promise,
-                       const std::string& errmsg) {
-  if (errmsg.empty()) {
-    promise->Resolve();
-  } else {
-    promise->RejectWithErrorMessage(errmsg);
-  }
+      url, name, base::BindOnce(RunCallbackInUI, callback));
 }

 // Callback of SetCookie.
-void OnSetCookie(scoped_refptr<util::Promise> promise, bool success) {
-  const std::string errmsg = success ? "" : "Setting cookie failed";
-  RunCallbackInUI(base::Bind(SettlePromiseInUI, std::move(promise), errmsg));
+void OnSetCookie(const Cookies::SetCallback& callback, bool success) {
+  RunCallbackInUI(
+      base::Bind(callback, success ? Cookies::SUCCESS : Cookies::FAILED));
 }

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

 // Sets cookie with |details| in IO thread.
 void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
                   std::unique_ptr<base::DictionaryValue> details,
-                   scoped_refptr<util::Promise> promise) {
+                   const Cookies::SetCallback& callback) {
  std::string url, name, value, domain, path;
  bool secure = false;
  bool http_only = false;
@@ -266,7 +235,7 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
          GURL(url), name, value, domain, path, creation_time, expiration_time,
          last_access_time, secure, http_only,
          net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT));
-  auto completion_callback = base::BindOnce(OnSetCookie, std::move(promise));
+  auto completion_callback = base::BindOnce(OnSetCookie, callback);
  if (!canonical_cookie || !canonical_cookie->IsCanonical()) {
    std::move(completion_callback).Run(false);
    return;
@@ -296,56 +265,44 @@ Cookies::Cookies(v8::Isolate* isolate, AtomBrowserContext* browser_context)

 Cookies::~Cookies() {}

-v8::Local<v8::Promise> Cookies::Get(const base::DictionaryValue& filter) {
-  scoped_refptr<util::Promise> promise = new util::Promise(isolate());
-
+void Cookies::Get(const base::DictionaryValue& filter,
+                  const GetCallback& callback) {
  auto copy = base::DictionaryValue::From(
      base::Value::ToUniquePtrValue(filter.Clone()));
  auto* getter = browser_context_->GetRequestContext();
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  content::BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
      base::BindOnce(GetCookiesOnIO, base::RetainedRef(getter), std::move(copy),
-                     promise));
-
-  return promise->GetHandle();
+                     callback));
 }

-v8::Local<v8::Promise> Cookies::Remove(const GURL& url,
-                                       const std::string& name) {
-  scoped_refptr<util::Promise> promise = new util::Promise(isolate());
-
+void Cookies::Remove(const GURL& url,
+                     const std::string& name,
+                     const base::Closure& callback) {
  auto* getter = browser_context_->GetRequestContext();
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
-      base::BindOnce(RemoveCookieOnIO, base::RetainedRef(getter), url, name,
-                     promise));
-
-  return promise->GetHandle();
+  content::BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::BindOnce(RemoveCookieOnIOThread, base::RetainedRef(getter), url,
+                     name, callback));
 }

-v8::Local<v8::Promise> Cookies::Set(const base::DictionaryValue& details) {
-  scoped_refptr<util::Promise> promise = new util::Promise(isolate());
-
+void Cookies::Set(const base::DictionaryValue& details,
+                  const SetCallback& callback) {
  auto copy = base::DictionaryValue::From(
      base::Value::ToUniquePtrValue(details.Clone()));
  auto* getter = browser_context_->GetRequestContext();
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  content::BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
      base::BindOnce(SetCookieOnIO, base::RetainedRef(getter), std::move(copy),
-                     promise));
-
-  return promise->GetHandle();
+                     callback));
 }

-v8::Local<v8::Promise> Cookies::FlushStore() {
-  scoped_refptr<util::Promise> promise = new util::Promise(isolate());
-
+void Cookies::FlushStore(const base::Closure& callback) {
  auto* getter = browser_context_->GetRequestContext();
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::IO},
-                           base::BindOnce(FlushCookieStoreOnIOThread,
-                                          base::RetainedRef(getter), promise));
-
-  return promise->GetHandle();
+  content::BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::BindOnce(FlushCookieStoreOnIOThread, base::RetainedRef(getter),
+                     callback));
 }

 void Cookies::OnCookieChanged(const CookieDetails* details) {
--- a/atom/browser/api/atom_api_cookies.h
+++ b/atom/browser/api/atom_api_cookies.h
@@ -10,7 +10,6 @@

 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/net/cookie_details.h"
-#include "atom/common/promise_util.h"
 #include "base/callback_list.h"
 #include "native_mate/handle.h"
 #include "net/cookies/canonical_cookie.h"
@@ -36,6 +35,9 @@ class Cookies : public mate::TrackableObject<Cookies> {
    FAILED,
  };

+  using GetCallback = base::Callback<void(Error, const net::CookieList&)>;
+  using SetCallback = base::Callback<void(Error)>;
+
  static mate::Handle<Cookies> Create(v8::Isolate* isolate,
                                      AtomBrowserContext* browser_context);

@@ -47,10 +49,12 @@ class Cookies : public mate::TrackableObject<Cookies> {
  Cookies(v8::Isolate* isolate, AtomBrowserContext* browser_context);
  ~Cookies() override;

-  v8::Local<v8::Promise> Get(const base::DictionaryValue& filter);
-  v8::Local<v8::Promise> Set(const base::DictionaryValue& details);
-  v8::Local<v8::Promise> Remove(const GURL& url, const std::string& name);
-  v8::Local<v8::Promise> FlushStore();
+  void Get(const base::DictionaryValue& filter, const GetCallback& callback);
+  void Remove(const GURL& url,
+              const std::string& name,
+              const base::Closure& callback);
+  void Set(const base::DictionaryValue& details, const SetCallback& callback);
+  void FlushStore(const base::Closure& callback);

  // CookieChangeNotifier subscription:
  void OnCookieChanged(const CookieDetails*);
--- a/atom/browser/api/atom_api_debugger.cc
+++ b/atom/browser/api/atom_api_debugger.cc
@@ -194,9 +194,7 @@ void Initialize(v8::Local<v8::Object> exports,
                void* priv) {
  v8::Isolate* isolate = context->GetIsolate();
  mate::Dictionary(isolate, exports)
-      .Set("Debugger", Debugger::GetConstructor(isolate)
-                           ->GetFunction(context)
-                           .ToLocalChecked());
+      .Set("Debugger", Debugger::GetConstructor(isolate)->GetFunction());
 }

 }  // namespace
--- a/atom/browser/api/atom_api_desktop_capturer.cc
+++ b/atom/browser/api/atom_api_desktop_capturer.cc
@@ -14,7 +14,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/media/webrtc/desktop_media_list.h"
-#include "chrome/browser/media/webrtc/window_icon_util.h"
 #include "content/public/browser/desktop_capture.h"
 #include "native_mate/dictionary.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
@@ -43,12 +42,6 @@ struct Converter<atom::api::DesktopCapturer::Source> {
             atom::api::NativeImage::Create(
                 isolate, gfx::Image(source.media_list_source.thumbnail)));
    dict.Set("display_id", source.display_id);
-    if (source.fetch_icon) {
-      dict.Set(
-          "appIcon",
-          atom::api::NativeImage::Create(
-              isolate, gfx::Image(GetWindowIcon(source.media_list_source.id))));
-    }
    return ConvertToV8(isolate, dict);
  }
 };
@@ -67,9 +60,7 @@ DesktopCapturer::~DesktopCapturer() {}

 void DesktopCapturer::StartHandling(bool capture_window,
                                    bool capture_screen,
-                                    const gfx::Size& thumbnail_size,
-                                    bool fetch_window_icons) {
-  fetch_window_icons_ = fetch_window_icons;
+                                    const gfx::Size& thumbnail_size) {
 #if defined(OS_WIN)
  if (content::desktop_capture::CreateDesktopCaptureOptions()
          .allow_directx_capturer()) {
@@ -143,8 +134,8 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
    capture_window_ = false;
    const auto& media_list_sources = list->GetSources();
    for (const auto& media_list_source : media_list_sources) {
-      window_sources.emplace_back(DesktopCapturer::Source{
-          media_list_source, std::string(), fetch_window_icons_});
+      window_sources.emplace_back(
+          DesktopCapturer::Source{media_list_source, std::string()});
    }
    std::move(window_sources.begin(), window_sources.end(),
              std::back_inserter(captured_sources_));
@@ -196,7 +187,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
  }

  if (!capture_window_ && !capture_screen_)
-    Emit("finished", captured_sources_, fetch_window_icons_);
+    Emit("finished", captured_sources_);
 }

 // static
--- a/atom/browser/api/atom_api_desktop_capturer.h
+++ b/atom/browser/api/atom_api_desktop_capturer.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>

-#include "atom/browser/api/trackable_object.h"
+#include "atom/browser/api/event_emitter.h"
 #include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
 #include "chrome/browser/media/webrtc/native_desktop_media_list.h"
 #include "native_mate/handle.h"
@@ -18,16 +18,13 @@ namespace atom {

 namespace api {

-class DesktopCapturer : public mate::TrackableObject<DesktopCapturer>,
+class DesktopCapturer : public mate::EventEmitter<DesktopCapturer>,
                        public DesktopMediaListObserver {
 public:
  struct Source {
    DesktopMediaList::Source media_list_source;
    // Will be an empty string if not available.
    std::string display_id;
-
-    // Whether or not this source should provide an icon.
-    bool fetch_icon = false;
  };

  static mate::Handle<DesktopCapturer> Create(v8::Isolate* isolate);
@@ -37,8 +34,7 @@ class DesktopCapturer : public mate::TrackableObject<DesktopCapturer>,

  void StartHandling(bool capture_window,
                     bool capture_screen,
-                     const gfx::Size& thumbnail_size,
-                     bool fetch_window_icons);
+                     const gfx::Size& thumbnail_size);

 protected:
  explicit DesktopCapturer(v8::Isolate* isolate);
@@ -63,7 +59,6 @@ class DesktopCapturer : public mate::TrackableObject<DesktopCapturer>,
  std::vector<DesktopCapturer::Source> captured_sources_;
  bool capture_window_ = false;
  bool capture_screen_ = false;
-  bool fetch_window_icons_ = false;
 #if defined(OS_WIN)
  bool using_directx_capturer_ = false;
 #endif  // defined(OS_WIN)
--- a/atom/browser/api/atom_api_dialog.cc
+++ b/atom/browser/api/atom_api_dialog.cc
@@ -12,7 +12,6 @@
 #include "atom/browser/ui/file_dialog.h"
 #include "atom/browser/ui/message_box.h"
 #include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/native_mate_converters/file_dialog_converter.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/image_converter.h"
 #include "atom/common/native_mate_converters/net_converter.h"
@@ -20,6 +19,50 @@

 #include "atom/common/node_includes.h"

+namespace mate {
+
+template <>
+struct Converter<file_dialog::Filter> {
+  static bool FromV8(v8::Isolate* isolate,
+                     v8::Local<v8::Value> val,
+                     file_dialog::Filter* out) {
+    mate::Dictionary dict;
+    if (!ConvertFromV8(isolate, val, &dict))
+      return false;
+    if (!dict.Get("name", &(out->first)))
+      return false;
+    if (!dict.Get("extensions", &(out->second)))
+      return false;
+    return true;
+  }
+};
+
+template <>
+struct Converter<file_dialog::DialogSettings> {
+  static bool FromV8(v8::Isolate* isolate,
+                     v8::Local<v8::Value> val,
+                     file_dialog::DialogSettings* out) {
+    mate::Dictionary dict;
+    if (!ConvertFromV8(isolate, val, &dict))
+      return false;
+    dict.Get("window", &(out->parent_window));
+    dict.Get("title", &(out->title));
+    dict.Get("message", &(out->message));
+    dict.Get("buttonLabel", &(out->button_label));
+    dict.Get("nameFieldLabel", &(out->name_field_label));
+    dict.Get("defaultPath", &(out->default_path));
+    dict.Get("filters", &(out->filters));
+    dict.Get("properties", &(out->properties));
+    dict.Get("showsTagField", &(out->shows_tag_field));
+#if defined(MAS_BUILD)
+    dict.Get("securityScopedBookmarks", &(out->security_scoped_bookmarks));
+#endif
+    return true;
+  }
+};
+
+}  // namespace mate
+
 namespace {

 void ShowMessageBox(int type,
--- a/atom/browser/api/atom_api_download_item.cc
+++ b/atom/browser/api/atom_api_download_item.cc
@@ -8,7 +8,6 @@

 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/native_mate_converters/file_dialog_converter.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "base/strings/utf_string_conversions.h"
@@ -166,15 +165,6 @@ base::FilePath DownloadItem::GetSavePath() const {
  return save_path_;
 }

-file_dialog::DialogSettings DownloadItem::GetSaveDialogOptions() const {
-  return dialog_options_;
-}
-
-void DownloadItem::SetSaveDialogOptions(
-    const file_dialog::DialogSettings& options) {
-  dialog_options_ = options;
-}
-
 std::string DownloadItem::GetLastModifiedTime() const {
  return download_item_->GetLastModifiedTime();
 }
@@ -210,8 +200,6 @@ void DownloadItem::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("isDone", &DownloadItem::IsDone)
      .SetMethod("setSavePath", &DownloadItem::SetSavePath)
      .SetMethod("getSavePath", &DownloadItem::GetSavePath)
-      .SetMethod("setSaveDialogOptions", &DownloadItem::SetSaveDialogOptions)
-      .SetMethod("getSaveDialogOptions", &DownloadItem::GetSaveDialogOptions)
      .SetMethod("getLastModifiedTime", &DownloadItem::GetLastModifiedTime)
      .SetMethod("getETag", &DownloadItem::GetETag)
      .SetMethod("getStartTime", &DownloadItem::GetStartTime);
@@ -244,9 +232,8 @@ void Initialize(v8::Local<v8::Object> exports,
                void* priv) {
  v8::Isolate* isolate = context->GetIsolate();
  mate::Dictionary(isolate, exports)
-      .Set("DownloadItem", atom::api::DownloadItem::GetConstructor(isolate)
-                               ->GetFunction(context)
-                               .ToLocalChecked());
+      .Set("DownloadItem",
+           atom::api::DownloadItem::GetConstructor(isolate)->GetFunction());
 }

 }  // namespace
--- a/atom/browser/api/atom_api_download_item.h
+++ b/atom/browser/api/atom_api_download_item.h
@@ -9,7 +9,6 @@
 #include <vector>

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

 private:
  base::FilePath save_path_;
-  file_dialog::DialogSettings dialog_options_;
  download::DownloadItem* download_item_;

  DISALLOW_COPY_AND_ASSIGN(DownloadItem);
--- a/atom/browser/api/atom_api_event.cc
+++ b/atom/browser/api/atom_api_event.cc
@@ -1,26 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/event_emitter.h"
-#include "atom/common/node_includes.h"
-#include "native_mate/dictionary.h"
-
-namespace {
-
-v8::Local<v8::Object> CreateWithSender(v8::Isolate* isolate,
-                                       v8::Local<v8::Object> sender) {
-  return mate::internal::CreateJSEvent(isolate, sender, nullptr, nullptr);
-}
-
-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("createWithSender", &CreateWithSender);
-}
-
-}  // namespace
-
-NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_event, Initialize)
--- a/atom/browser/api/atom_api_global_shortcut.cc
+++ b/atom/browser/api/atom_api_global_shortcut.cc
@@ -5,46 +5,16 @@
 #include "atom/browser/api/atom_api_global_shortcut.h"

 #include <string>
-#include <vector>

-#include "atom/browser/api/atom_api_system_preferences.h"
 #include "atom/common/native_mate_converters/accelerator_converter.h"
 #include "atom/common/native_mate_converters/callback.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
-
 using extensions::GlobalShortcutListener;

-namespace {
-
-#if defined(OS_MACOSX)
-bool RegisteringMediaKeyForUntrustedClient(const ui::Accelerator& accelerator) {
-  if (base::mac::IsAtLeastOS10_14()) {
-    constexpr ui::KeyboardCode mediaKeys[] = {
-        ui::VKEY_MEDIA_PLAY_PAUSE, ui::VKEY_MEDIA_NEXT_TRACK,
-        ui::VKEY_MEDIA_PREV_TRACK, ui::VKEY_MEDIA_STOP};
-
-    if (std::find(std::begin(mediaKeys), std::end(mediaKeys),
-                  accelerator.key_code()) != std::end(mediaKeys)) {
-      bool trusted =
-          atom::api::SystemPreferences::IsTrustedAccessibilityClient(false);
-      if (!trusted)
-        return true;
-    }
-  }
-  return false;
-}
-#endif
-
-}  // namespace
-
 namespace atom {

 namespace api {
@@ -61,43 +31,15 @@ void GlobalShortcut::OnKeyPressed(const ui::Accelerator& accelerator) {
  if (accelerator_callback_map_.find(accelerator) ==
      accelerator_callback_map_.end()) {
    // This should never occur, because if it does, GlobalGlobalShortcutListener
-    // notifies us with wrong accelerator.
+    // notifes us with wrong accelerator.
    NOTREACHED();
    return;
  }
  accelerator_callback_map_[accelerator].Run();
 }

-bool GlobalShortcut::RegisterAll(
-    const std::vector<ui::Accelerator>& accelerators,
-    const base::Closure& callback) {
-  std::vector<ui::Accelerator> registered;
-
-  for (auto& accelerator : accelerators) {
-#if defined(OS_MACOSX)
-    if (RegisteringMediaKeyForUntrustedClient(accelerator))
-      return false;
-
-    GlobalShortcutListener* listener = GlobalShortcutListener::GetInstance();
-    if (!listener->RegisterAccelerator(accelerator, this)) {
-      // unregister all shortcuts if any failed
-      UnregisterSome(registered);
-      return false;
-    }
-#endif
-    registered.push_back(accelerator);
-    accelerator_callback_map_[accelerator] = callback;
-  }
-  return true;
-}
-
 bool GlobalShortcut::Register(const ui::Accelerator& accelerator,
                              const base::Closure& callback) {
-#if defined(OS_MACOSX)
-  if (RegisteringMediaKeyForUntrustedClient(accelerator))
-    return false;
-#endif
-
  if (!GlobalShortcutListener::GetInstance()->RegisterAccelerator(accelerator,
                                                                  this)) {
    return false;
@@ -116,13 +58,6 @@ void GlobalShortcut::Unregister(const ui::Accelerator& accelerator) {
                                                               this);
 }

-void GlobalShortcut::UnregisterSome(
-    const std::vector<ui::Accelerator>& accelerators) {
-  for (auto& accelerator : accelerators) {
-    Unregister(accelerator);
-  }
-}
-
 bool GlobalShortcut::IsRegistered(const ui::Accelerator& accelerator) {
  return ContainsKey(accelerator_callback_map_, accelerator);
 }
@@ -142,7 +77,6 @@ void GlobalShortcut::BuildPrototype(v8::Isolate* isolate,
                                    v8::Local<v8::FunctionTemplate> prototype) {
  prototype->SetClassName(mate::StringToV8(isolate, "GlobalShortcut"));
  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("registerAll", &GlobalShortcut::RegisterAll)
      .SetMethod("register", &GlobalShortcut::Register)
      .SetMethod("isRegistered", &GlobalShortcut::IsRegistered)
      .SetMethod("unregister", &GlobalShortcut::Unregister)
--- a/atom/browser/api/atom_api_global_shortcut.h
+++ b/atom/browser/api/atom_api_global_shortcut.h
@@ -7,7 +7,6 @@

 #include <map>
 #include <string>
-#include <vector>

 #include "atom/browser/api/trackable_object.h"
 #include "base/callback.h"
@@ -34,13 +33,10 @@ class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
 private:
  typedef std::map<ui::Accelerator, base::Closure> AcceleratorCallbackMap;

-  bool RegisterAll(const std::vector<ui::Accelerator>& accelerators,
-                   const base::Closure& callback);
  bool Register(const ui::Accelerator& accelerator,
                const base::Closure& callback);
  bool IsRegistered(const ui::Accelerator& accelerator);
  void Unregister(const ui::Accelerator& accelerator);
-  void UnregisterSome(const std::vector<ui::Accelerator>& accelerators);
  void UnregisterAll();

  // GlobalShortcutListener::Observer implementation.
--- a/atom/browser/api/atom_api_in_app_purchase.cc
+++ b/atom/browser/api/atom_api_in_app_purchase.cc
@@ -132,9 +132,8 @@ void Initialize(v8::Local<v8::Object> exports,
  v8::Isolate* isolate = context->GetIsolate();
  mate::Dictionary dict(isolate, exports);
  dict.Set("inAppPurchase", InAppPurchase::Create(isolate));
-  dict.Set("InAppPurchase", InAppPurchase::GetConstructor(isolate)
-                                ->GetFunction(context)
-                                .ToLocalChecked());
+  dict.Set("InAppPurchase",
+           InAppPurchase::GetConstructor(isolate)->GetFunction());
 #endif
 }

--- a/atom/browser/api/atom_api_menu.cc
+++ b/atom/browser/api/atom_api_menu.cc
@@ -41,8 +41,6 @@ void Menu::AfterInit(v8::Isolate* isolate) {
  delegate.Get("isCommandIdEnabled", &is_enabled_);
  delegate.Get("isCommandIdVisible", &is_visible_);
  delegate.Get("getAcceleratorForCommandId", &get_accelerator_);
-  delegate.Get("shouldRegisterAcceleratorForCommandId",
-               &should_register_accelerator_);
  delegate.Get("executeCommand", &execute_command_);
  delegate.Get("menuWillShow", &menu_will_show_);
 }
@@ -76,12 +74,6 @@ bool Menu::GetAcceleratorForCommandIdWithParams(
  return mate::ConvertFromV8(isolate(), val, accelerator);
 }

-bool Menu::ShouldRegisterAcceleratorForCommandId(int command_id) const {
-  v8::Locker locker(isolate());
-  v8::HandleScope handle_scope(isolate());
-  return should_register_accelerator_.Run(GetWrapper(), command_id);
-}
-
 void Menu::ExecuteCommand(int command_id, int flags) {
  v8::Locker locker(isolate());
  v8::HandleScope handle_scope(isolate());
@@ -90,7 +82,7 @@ void Menu::ExecuteCommand(int command_id, int flags) {
                       command_id);
 }

-void Menu::OnMenuWillShow(ui::SimpleMenuModel* source) {
+void Menu::MenuWillShow(ui::SimpleMenuModel* source) {
  v8::Locker locker(isolate());
  v8::HandleScope handle_scope(isolate());
  menu_will_show_.Run(GetWrapper());
@@ -163,12 +155,6 @@ base::string16 Menu::GetSublabelAt(int index) const {
  return model_->GetSublabelAt(index);
 }

-base::string16 Menu::GetAcceleratorTextAt(int index) const {
-  ui::Accelerator accelerator;
-  model_->GetAcceleratorAtWithParams(index, true, &accelerator);
-  return accelerator.GetShortcutText();
-}
-
 bool Menu::IsItemCheckedAt(int index) const {
  return model_->IsItemCheckedAt(index);
 }
@@ -209,7 +195,6 @@ void Menu::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("getCommandIdAt", &Menu::GetCommandIdAt)
      .SetMethod("getLabelAt", &Menu::GetLabelAt)
      .SetMethod("getSublabelAt", &Menu::GetSublabelAt)
-      .SetMethod("getAcceleratorTextAt", &Menu::GetAcceleratorTextAt)
      .SetMethod("isItemCheckedAt", &Menu::IsItemCheckedAt)
      .SetMethod("isEnabledAt", &Menu::IsEnabledAt)
      .SetMethod("isVisibleAt", &Menu::IsVisibleAt)
@@ -233,9 +218,7 @@ void Initialize(v8::Local<v8::Object> exports,
  Menu::SetConstructor(isolate, base::Bind(&Menu::New));

  mate::Dictionary dict(isolate, exports);
-  dict.Set(
-      "Menu",
-      Menu::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
+  dict.Set("Menu", Menu::GetConstructor(isolate)->GetFunction());
 #if defined(OS_MACOSX)
  dict.SetMethod("setApplicationMenu", &Menu::SetApplicationMenu);
  dict.SetMethod("sendActionToFirstResponder",
--- a/atom/browser/api/atom_api_menu.h
+++ b/atom/browser/api/atom_api_menu.h
@@ -51,9 +51,8 @@ class Menu : public mate::TrackableObject<Menu>,
      int command_id,
      bool use_default_accelerator,
      ui::Accelerator* accelerator) const override;
-  bool ShouldRegisterAcceleratorForCommandId(int command_id) const override;
  void ExecuteCommand(int command_id, int event_flags) override;
-  void OnMenuWillShow(ui::SimpleMenuModel* source) override;
+  void MenuWillShow(ui::SimpleMenuModel* source) override;

  virtual void PopupAt(TopLevelWindow* window,
                       int x,
@@ -92,7 +91,6 @@ class Menu : public mate::TrackableObject<Menu>,
  int GetCommandIdAt(int index) const;
  base::string16 GetLabelAt(int index) const;
  base::string16 GetSublabelAt(int index) const;
-  base::string16 GetAcceleratorTextAt(int index) const;
  bool IsItemCheckedAt(int index) const;
  bool IsEnabledAt(int index) const;
  bool IsVisibleAt(int index) const;
@@ -103,7 +101,6 @@ class Menu : public mate::TrackableObject<Menu>,
  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::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::Callback<void(v8::Local<v8::Value>)> menu_will_show_;
--- a/atom/browser/api/atom_api_menu_mac.mm
+++ b/atom/browser/api/atom_api_menu_mac.mm
@@ -9,8 +9,6 @@
 #include "base/mac/scoped_sending_event.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"

@@ -45,7 +43,7 @@ void MenuMac::PopupAt(TopLevelWindow* window,
  auto popup = base::Bind(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(),
                          native_window->GetWeakPtr(), window->weak_map_id(), x,
                          y, positioning_item, callback);
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, popup);
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, popup);
 }

 void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
@@ -56,7 +54,7 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
                        base::Closure callback) {
  if (!native_window)
    return;
-  NSWindow* nswindow = native_window->GetNativeWindow().GetNativeNSWindow();
+  NSWindow* nswindow = native_window->GetNativeWindow();

  auto close_callback = base::Bind(
      &MenuMac::OnClosed, weak_factory_.GetWeakPtr(), window_id, callback);
@@ -99,7 +97,7 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,

  [popup_controllers_[window_id] setCloseCallback:close_callback];
  // Make sure events can be pumped while the menu is up.
-  base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
+  base::MessageLoop::ScopedNestableTaskAllower allow;

  // One of the events that could be pumped is |window.close()|.
  // User-initiated event-tracking loops protect against this by
--- a/atom/browser/api/atom_api_net.cc
+++ b/atom/browser/api/atom_api_net.cc
@@ -31,9 +31,7 @@ void Net::BuildPrototype(v8::Isolate* isolate,
 }

 v8::Local<v8::Value> Net::URLRequest(v8::Isolate* isolate) {
-  return URLRequest::GetConstructor(isolate)
-      ->GetFunction(isolate->GetCurrentContext())
-      .ToLocalChecked();
+  return URLRequest::GetConstructor(isolate)->GetFunction();
 }

 }  // namespace api
@@ -55,8 +53,7 @@ void Initialize(v8::Local<v8::Object> exports,

  mate::Dictionary dict(isolate, exports);
  dict.Set("net", Net::Create(isolate));
-  dict.Set("Net",
-           Net::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
+  dict.Set("Net", Net::GetConstructor(isolate)->GetFunction());
 }

 }  // namespace
--- a/atom/browser/api/atom_api_net_log.cc
+++ b/atom/browser/api/atom_api_net_log.cc
@@ -7,11 +7,10 @@
 #include <utility>

 #include "atom/browser/atom_browser_context.h"
-#include "atom/browser/net/system_network_context_manager.h"
+#include "atom/browser/atom_browser_main_parts.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "base/command_line.h"
-#include "chrome/browser/browser_process.h"
 #include "components/net_log/chrome_net_log.h"
 #include "content/public/browser/storage_partition.h"
 #include "native_mate/dictionary.h"
@@ -28,8 +27,8 @@ NetLog::NetLog(v8::Isolate* isolate, AtomBrowserContext* browser_context)
    : browser_context_(browser_context) {
  Init(isolate);

-  net_log_writer_ = g_browser_process->system_network_context_manager()
-                        ->GetNetExportFileWriter();
+  net_log_writer_ =
+      atom::AtomBrowserMainParts::Get()->net_log()->net_export_file_writer();
  net_log_writer_->AddObserver(this);
 }

--- a/atom/browser/api/atom_api_notification.cc
+++ b/atom/browser/api/atom_api_notification.cc
@@ -5,13 +5,13 @@
 #include "atom/browser/api/atom_api_notification.h"

 #include "atom/browser/api/atom_api_menu.h"
-#include "atom/browser/atom_browser_client.h"
 #include "atom/browser/browser.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/image_converter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "base/guid.h"
 #include "base/strings/utf_string_conversions.h"
+#include "brightray/browser/browser_client.h"
 #include "native_mate/constructor.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
@@ -22,10 +22,10 @@

 namespace mate {
 template <>
-struct Converter<atom::NotificationAction> {
+struct Converter<brightray::NotificationAction> {
  static bool FromV8(v8::Isolate* isolate,
                     v8::Local<v8::Value> val,
-                     atom::NotificationAction* out) {
+                     brightray::NotificationAction* out) {
    mate::Dictionary dict;
    if (!ConvertFromV8(isolate, val, &dict))
      return false;
@@ -38,7 +38,7 @@ struct Converter<atom::NotificationAction> {
  }

  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   atom::NotificationAction val) {
+                                   brightray::NotificationAction val) {
    mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
    dict.Set("text", val.text);
    dict.Set("type", val.type);
@@ -56,8 +56,7 @@ Notification::Notification(v8::Isolate* isolate,
                           mate::Arguments* args) {
  InitWith(isolate, wrapper);

-  presenter_ = static_cast<AtomBrowserClient*>(AtomBrowserClient::Get())
-                   ->GetNotificationPresenter();
+  presenter_ = brightray::BrowserClient::Get()->GetNotificationPresenter();

  mate::Dictionary opts;
  if (args->GetNext(&opts)) {
@@ -120,7 +119,7 @@ base::string16 Notification::GetSound() const {
  return sound_;
 }

-std::vector<atom::NotificationAction> Notification::GetActions() const {
+std::vector<brightray::NotificationAction> Notification::GetActions() const {
  return actions_;
 }

@@ -158,7 +157,7 @@ void Notification::SetSound(const base::string16& new_sound) {
 }

 void Notification::SetActions(
-    const std::vector<atom::NotificationAction>& actions) {
+    const std::vector<brightray::NotificationAction>& actions) {
  actions_ = actions;
 }

@@ -201,7 +200,7 @@ void Notification::Show() {
  if (presenter_) {
    notification_ = presenter_->CreateNotification(this, base::GenerateGUID());
    if (notification_) {
-      atom::NotificationOptions options;
+      brightray::NotificationOptions options;
      options.title = title_;
      options.subtitle = subtitle_;
      options.msg = body_;
@@ -219,8 +218,7 @@ void Notification::Show() {
 }

 bool Notification::IsSupported() {
-  return !!static_cast<AtomBrowserClient*>(AtomBrowserClient::Get())
-               ->GetNotificationPresenter();
+  return !!brightray::BrowserClient::Get()->GetNotificationPresenter();
 }

 // static
@@ -263,9 +261,8 @@ void Initialize(v8::Local<v8::Object> exports,
  Notification::SetConstructor(isolate, base::Bind(&Notification::New));

  mate::Dictionary dict(isolate, exports);
-  dict.Set("Notification", Notification::GetConstructor(isolate)
-                               ->GetFunction(context)
-                               .ToLocalChecked());
+  dict.Set("Notification",
+           Notification::GetConstructor(isolate)->GetFunction());

  dict.SetMethod("isSupported", &Notification::IsSupported);
 }
--- a/atom/browser/api/atom_api_notification.h
+++ b/atom/browser/api/atom_api_notification.h
@@ -10,10 +10,10 @@
 #include <vector>

 #include "atom/browser/api/trackable_object.h"
-#include "atom/browser/notifications/notification.h"
-#include "atom/browser/notifications/notification_delegate.h"
-#include "atom/browser/notifications/notification_presenter.h"
 #include "base/strings/utf_string_conversions.h"
+#include "brightray/browser/notification.h"
+#include "brightray/browser/notification_delegate.h"
+#include "brightray/browser/notification_presenter.h"
 #include "native_mate/handle.h"
 #include "ui/gfx/image/image.h"

@@ -22,7 +22,7 @@ namespace atom {
 namespace api {

 class Notification : public mate::TrackableObject<Notification>,
-                     public NotificationDelegate {
+                     public brightray::NotificationDelegate {
 public:
  static mate::WrappableBase* New(mate::Arguments* args);
  static bool IsSupported();
@@ -55,7 +55,7 @@ class Notification : public mate::TrackableObject<Notification>,
  bool GetHasReply() const;
  base::string16 GetReplyPlaceholder() const;
  base::string16 GetSound() const;
-  std::vector<atom::NotificationAction> GetActions() const;
+  std::vector<brightray::NotificationAction> GetActions() const;
  base::string16 GetCloseButtonText() const;

  // Prop Setters
@@ -66,7 +66,7 @@ class Notification : public mate::TrackableObject<Notification>,
  void SetHasReply(bool new_has_reply);
  void SetReplyPlaceholder(const base::string16& new_reply_placeholder);
  void SetSound(const base::string16& sound);
-  void SetActions(const std::vector<atom::NotificationAction>& actions);
+  void SetActions(const std::vector<brightray::NotificationAction>& actions);
  void SetCloseButtonText(const base::string16& text);

 private:
@@ -80,12 +80,12 @@ class Notification : public mate::TrackableObject<Notification>,
  bool has_reply_ = false;
  base::string16 reply_placeholder_;
  base::string16 sound_;
-  std::vector<atom::NotificationAction> actions_;
+  std::vector<brightray::NotificationAction> actions_;
  base::string16 close_button_text_;

-  atom::NotificationPresenter* presenter_;
+  brightray::NotificationPresenter* presenter_;

-  base::WeakPtr<atom::Notification> notification_;
+  base::WeakPtr<brightray::Notification> notification_;

  DISALLOW_COPY_AND_ASSIGN(Notification);
 };
--- a/atom/browser/api/atom_api_power_monitor.cc
+++ b/atom/browser/api/atom_api_power_monitor.cc
@@ -141,9 +141,8 @@ void Initialize(v8::Local<v8::Object> exports,
  v8::Isolate* isolate = context->GetIsolate();
  mate::Dictionary dict(isolate, exports);
  dict.Set("powerMonitor", PowerMonitor::Create(isolate));
-  dict.Set("PowerMonitor", PowerMonitor::GetConstructor(isolate)
-                               ->GetFunction(context)
-                               .ToLocalChecked());
+  dict.Set("PowerMonitor",
+           PowerMonitor::GetConstructor(isolate)->GetFunction());
 }

 }  // namespace
--- a/atom/browser/api/atom_api_power_save_blocker.cc
+++ b/atom/browser/api/atom_api_power_save_blocker.cc
@@ -6,13 +6,9 @@

 #include <string>

-#include "base/task/post_task.h"
+#include "base/task_scheduler/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "content/public/common/service_manager_connection.h"
 #include "native_mate/dictionary.h"
-#include "services/device/public/mojom/constants.mojom.h"
-#include "services/device/public/mojom/wake_lock_provider.mojom.h"
-#include "services/service_manager/public/cpp/connector.h"

 #include "atom/common/node_includes.h"

@@ -43,19 +39,16 @@ namespace atom {
 namespace api {

 PowerSaveBlocker::PowerSaveBlocker(v8::Isolate* isolate)
-    : current_lock_type_(device::mojom::WakeLockType::kPreventAppSuspension),
-      is_wake_lock_active_(false) {
+    : current_blocker_type_(
+          device::mojom::WakeLockType::kPreventAppSuspension) {
  Init(isolate);
 }

 PowerSaveBlocker::~PowerSaveBlocker() {}

 void PowerSaveBlocker::UpdatePowerSaveBlocker() {
-  if (wake_lock_types_.empty()) {
-    if (is_wake_lock_active_) {
-      GetWakeLock()->CancelWakeLock();
-      is_wake_lock_active_ = false;
-    }
+  if (power_save_blocker_types_.empty()) {
+    power_save_blocker_.reset();
    return;
  }

@@ -65,57 +58,45 @@ void PowerSaveBlocker::UpdatePowerSaveBlocker() {
  // higher precedence level than |WakeLockType::kPreventAppSuspension|.
  //
  // Only the highest-precedence blocker type takes effect.
-  device::mojom::WakeLockType new_lock_type =
+  device::mojom::WakeLockType new_blocker_type =
      device::mojom::WakeLockType::kPreventAppSuspension;
-  for (const auto& element : wake_lock_types_) {
+  for (const auto& element : power_save_blocker_types_) {
    if (element.second == device::mojom::WakeLockType::kPreventDisplaySleep) {
-      new_lock_type = device::mojom::WakeLockType::kPreventDisplaySleep;
+      new_blocker_type = device::mojom::WakeLockType::kPreventDisplaySleep;
      break;
    }
  }

-  if (current_lock_type_ != new_lock_type) {
-    GetWakeLock()->ChangeType(new_lock_type, base::DoNothing());
-    current_lock_type_ = new_lock_type;
+  if (!power_save_blocker_ || new_blocker_type != current_blocker_type_) {
+    auto new_blocker = std::make_unique<device::PowerSaveBlocker>(
+        new_blocker_type, device::mojom::WakeLockReason::kOther,
+        ATOM_PRODUCT_NAME, base::ThreadTaskRunnerHandle::Get(),
+        // This task runner may be used by some device service
+        // implementation bits to interface with dbus client code, which in
+        // turn imposes some subtle thread affinity on the clients. We
+        // therefore require a single-thread runner.
+        base::CreateSingleThreadTaskRunnerWithTraits(
+            {base::MayBlock(), base::TaskPriority::BACKGROUND}));
+    power_save_blocker_.swap(new_blocker);
+    current_blocker_type_ = new_blocker_type;
  }
-  if (!is_wake_lock_active_) {
-    GetWakeLock()->RequestWakeLock();
-    is_wake_lock_active_ = true;
-  }
-}
-
-device::mojom::WakeLock* PowerSaveBlocker::GetWakeLock() {
-  if (!wake_lock_) {
-    device::mojom::WakeLockProviderPtr wake_lock_provider;
-    DCHECK(content::ServiceManagerConnection::GetForProcess());
-    auto* connector =
-        content::ServiceManagerConnection::GetForProcess()->GetConnector();
-    connector->BindInterface(device::mojom::kServiceName,
-                             mojo::MakeRequest(&wake_lock_provider));
-
-    wake_lock_provider->GetWakeLockWithoutContext(
-        device::mojom::WakeLockType::kPreventAppSuspension,
-        device::mojom::WakeLockReason::kOther, ATOM_PRODUCT_NAME,
-        mojo::MakeRequest(&wake_lock_));
-  }
-  return wake_lock_.get();
 }

 int PowerSaveBlocker::Start(device::mojom::WakeLockType type) {
  static int count = 0;
-  wake_lock_types_[count] = type;
+  power_save_blocker_types_[count] = type;
  UpdatePowerSaveBlocker();
  return count++;
 }

 bool PowerSaveBlocker::Stop(int id) {
-  bool success = wake_lock_types_.erase(id) > 0;
+  bool success = power_save_blocker_types_.erase(id) > 0;
  UpdatePowerSaveBlocker();
  return success;
 }

 bool PowerSaveBlocker::IsStarted(int id) {
-  return wake_lock_types_.find(id) != wake_lock_types_.end();
+  return power_save_blocker_types_.find(id) != power_save_blocker_types_.end();
 }

 // static
--- a/atom/browser/api/atom_api_power_save_blocker.h
+++ b/atom/browser/api/atom_api_power_save_blocker.h
@@ -10,7 +10,7 @@

 #include "atom/browser/api/trackable_object.h"
 #include "native_mate/handle.h"
-#include "services/device/public/mojom/wake_lock.mojom.h"
+#include "services/device/wake_lock/power_save_blocker/power_save_blocker.h"

 namespace mate {
 class Dictionary;
@@ -37,19 +37,14 @@ class PowerSaveBlocker : public mate::TrackableObject<PowerSaveBlocker> {
  bool Stop(int id);
  bool IsStarted(int id);

-  device::mojom::WakeLock* GetWakeLock();
+  std::unique_ptr<device::PowerSaveBlocker> power_save_blocker_;

-  // Current wake lock level.
-  device::mojom::WakeLockType current_lock_type_;
-
-  // Whether the wake lock is currently active.
-  bool is_wake_lock_active_;
+  // Current blocker type used by |power_save_blocker_|
+  device::mojom::WakeLockType current_blocker_type_;

  // Map from id to the corresponding blocker type for each request.
  using WakeLockTypeMap = std::map<int, device::mojom::WakeLockType>;
-  WakeLockTypeMap wake_lock_types_;
-
-  device::mojom::WakeLockPtr wake_lock_;
+  WakeLockTypeMap power_save_blocker_types_;

  DISALLOW_COPY_AND_ASSIGN(PowerSaveBlocker);
 };
--- a/atom/browser/api/atom_api_protocol.cc
+++ b/atom/browser/api/atom_api_protocol.cc
@@ -24,119 +24,47 @@

 using content::BrowserThread;

+namespace atom {
+
+namespace api {
+
 namespace {

 // List of registered custom standard schemes.
 std::vector<std::string> g_standard_schemes;

-struct SchemeOptions {
-  bool standard = false;
-  bool secure = false;
-  bool bypassCSP = false;
-  bool allowServiceWorkers = false;
-  bool supportFetchAPI = false;
-  bool corsEnabled = false;
-};
-
-struct CustomScheme {
-  std::string scheme;
-  SchemeOptions options;
-};
-
 }  // namespace

-namespace mate {
-
-template <>
-struct Converter<CustomScheme> {
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     CustomScheme* out) {
-    mate::Dictionary dict;
-    if (!ConvertFromV8(isolate, val, &dict))
-      return false;
-    if (!dict.Get("scheme", &(out->scheme)))
-      return false;
-    mate::Dictionary opt;
-    // options are optional. Default values specified in SchemeOptions are used
-    if (dict.Get("privileges", &opt)) {
-      opt.Get("standard", &(out->options.standard));
-      opt.Get("supportFetchAPI", &(out->options.supportFetchAPI));
-      opt.Get("secure", &(out->options.secure));
-      opt.Get("bypassCSP", &(out->options.bypassCSP));
-      opt.Get("allowServiceWorkers", &(out->options.allowServiceWorkers));
-      opt.Get("supportFetchAPI", &(out->options.supportFetchAPI));
-      opt.Get("corsEnabled", &(out->options.corsEnabled));
-    }
-    return true;
-  }
-};
-
-}  // namespace mate
-
-namespace atom {
-
-namespace api {
-
 std::vector<std::string> GetStandardSchemes() {
  return g_standard_schemes;
 }

-void RegisterSchemesAsPrivileged(v8::Local<v8::Value> val,
-                                 mate::Arguments* args) {
-  std::vector<CustomScheme> custom_schemes;
-  if (!mate::ConvertFromV8(args->isolate(), val, &custom_schemes)) {
-    args->ThrowError("Argument must be an array of custom schemes.");
-    return;
+void RegisterStandardSchemes(const std::vector<std::string>& schemes,
+                             mate::Arguments* args) {
+  g_standard_schemes = schemes;
+
+  mate::Dictionary opts;
+  bool secure = false;
+  args->GetNext(&opts) && opts.Get("secure", &secure);
+
+  // Dynamically register the schemes.
+  auto* policy = content::ChildProcessSecurityPolicy::GetInstance();
+  for (const std::string& scheme : schemes) {
+    url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITH_HOST);
+    if (secure) {
+      url::AddSecureScheme(scheme.c_str());
+    }
+    policy->RegisterWebSafeScheme(scheme);
  }

-  std::vector<std::string> secure_schemes, cspbypassing_schemes, fetch_schemes,
-      service_worker_schemes, cors_schemes;
-  for (const auto& custom_scheme : custom_schemes) {
-    // Register scheme to privileged list (https, wss, data, chrome-extension)
-    if (custom_scheme.options.standard) {
-      auto* policy = content::ChildProcessSecurityPolicy::GetInstance();
-      url::AddStandardScheme(custom_scheme.scheme.c_str(),
-                             url::SCHEME_WITH_HOST);
-      g_standard_schemes.push_back(custom_scheme.scheme);
-      policy->RegisterWebSafeScheme(custom_scheme.scheme);
-    }
-    if (custom_scheme.options.secure) {
-      secure_schemes.push_back(custom_scheme.scheme);
-      url::AddSecureScheme(custom_scheme.scheme.c_str());
-    }
-    if (custom_scheme.options.bypassCSP) {
-      cspbypassing_schemes.push_back(custom_scheme.scheme);
-      url::AddCSPBypassingScheme(custom_scheme.scheme.c_str());
-    }
-    if (custom_scheme.options.corsEnabled) {
-      cors_schemes.push_back(custom_scheme.scheme);
-      url::AddCorsEnabledScheme(custom_scheme.scheme.c_str());
-    }
-    if (custom_scheme.options.supportFetchAPI) {
-      fetch_schemes.push_back(custom_scheme.scheme);
-    }
-    if (custom_scheme.options.allowServiceWorkers) {
-      service_worker_schemes.push_back(custom_scheme.scheme);
-    }
-  }
-
-  const auto AppendSchemesToCmdLine = [](const char* switch_name,
-                                         std::vector<std::string> schemes) {
-    // Add the schemes to command line switches, so child processes can also
-    // register them.
+  // Add the schemes to command line switches, so child processes can also
+  // register them.
+  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      atom::switches::kStandardSchemes, base::JoinString(schemes, ","));
+  if (secure) {
    base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-        switch_name, base::JoinString(schemes, ","));
-  };
-
-  AppendSchemesToCmdLine(atom::switches::kSecureSchemes, secure_schemes);
-  AppendSchemesToCmdLine(atom::switches::kBypassCSPSchemes,
-                         cspbypassing_schemes);
-  AppendSchemesToCmdLine(atom::switches::kCORSSchemes, cors_schemes);
-  AppendSchemesToCmdLine(atom::switches::kFetchSchemes, fetch_schemes);
-  AppendSchemesToCmdLine(atom::switches::kServiceWorkerSchemes,
-                         service_worker_schemes);
-  AppendSchemesToCmdLine(atom::switches::kStandardSchemes, g_standard_schemes);
+        atom::switches::kSecureSchemes, base::JoinString(schemes, ","));
+  }
 }

 Protocol::Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context)
@@ -145,14 +73,20 @@ Protocol::Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context)
 }

 Protocol::~Protocol() {}
+
+void Protocol::RegisterServiceWorkerSchemes(
+    const std::vector<std::string>& schemes) {
+  atom::AtomBrowserClient::SetCustomServiceWorkerSchemes(schemes);
+}
+
 void Protocol::UnregisterProtocol(const std::string& scheme,
                                  mate::Arguments* args) {
  CompletionCallback callback;
  args->GetNext(&callback);
  auto* getter = static_cast<URLRequestContextGetter*>(
      browser_context_->GetRequestContext());
-  base::PostTaskWithTraitsAndReplyWithResult(
-      FROM_HERE, {content::BrowserThread::IO},
+  content::BrowserThread::PostTaskAndReplyWithResult(
+      content::BrowserThread::IO, FROM_HERE,
      base::BindOnce(&Protocol::UnregisterProtocolInIO,
                     base::RetainedRef(getter), scheme),
      base::BindOnce(&Protocol::OnIOCompleted, GetWeakPtr(), callback));
@@ -169,29 +103,22 @@ Protocol::ProtocolError Protocol::UnregisterProtocolInIO(
  return PROTOCOL_OK;
 }

-bool IsProtocolHandledInIO(
-    scoped_refptr<URLRequestContextGetter> request_context_getter,
-    const std::string& scheme) {
-  bool is_handled =
-      request_context_getter->job_factory()->IsHandledProtocol(scheme);
-  return is_handled;
-}
-
-void PromiseCallback(scoped_refptr<util::Promise> promise, bool handled) {
-  promise->Resolve(handled);
-}
-
-v8::Local<v8::Promise> Protocol::IsProtocolHandled(const std::string& scheme) {
-  scoped_refptr<util::Promise> promise = new util::Promise(isolate());
+void Protocol::IsProtocolHandled(const std::string& scheme,
+                                 const BooleanCallback& callback) {
  auto* getter = static_cast<URLRequestContextGetter*>(
      browser_context_->GetRequestContext());
+  content::BrowserThread::PostTaskAndReplyWithResult(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(&Protocol::IsProtocolHandledInIO, base::RetainedRef(getter),
+                 scheme),
+      callback);
+}

-  base::PostTaskWithTraitsAndReplyWithResult(
-      FROM_HERE, {content::BrowserThread::IO},
-      base::Bind(&IsProtocolHandledInIO, base::RetainedRef(getter), scheme),
-      base::Bind(&PromiseCallback, promise));
-
-  return promise->GetHandle();
+// static
+bool Protocol::IsProtocolHandledInIO(
+    scoped_refptr<URLRequestContextGetter> request_context_getter,
+    const std::string& scheme) {
+  return request_context_getter->job_factory()->IsHandledProtocol(scheme);
 }

 void Protocol::UninterceptProtocol(const std::string& scheme,
@@ -200,8 +127,8 @@ void Protocol::UninterceptProtocol(const std::string& scheme,
  args->GetNext(&callback);
  auto* getter = static_cast<URLRequestContextGetter*>(
      browser_context_->GetRequestContext());
-  base::PostTaskWithTraitsAndReplyWithResult(
-      FROM_HERE, {content::BrowserThread::IO},
+  content::BrowserThread::PostTaskAndReplyWithResult(
+      content::BrowserThread::IO, FROM_HERE,
      base::BindOnce(&Protocol::UninterceptProtocolInIO,
                     base::RetainedRef(getter), scheme),
      base::BindOnce(&Protocol::OnIOCompleted, GetWeakPtr(), callback));
@@ -261,6 +188,8 @@ void Protocol::BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::FunctionTemplate> prototype) {
  prototype->SetClassName(mate::StringToV8(isolate, "Protocol"));
  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+      .SetMethod("registerServiceWorkerSchemes",
+                 &Protocol::RegisterServiceWorkerSchemes)
      .SetMethod("registerStringProtocol",
                 &Protocol::RegisterProtocol<URLRequestStringJob>)
      .SetMethod("registerBufferProtocol",
@@ -292,16 +221,16 @@ void Protocol::BuildPrototype(v8::Isolate* isolate,

 namespace {

-void RegisterSchemesAsPrivileged(v8::Local<v8::Value> val,
-                                 mate::Arguments* args) {
+void RegisterStandardSchemes(const std::vector<std::string>& schemes,
+                             mate::Arguments* args) {
  if (atom::Browser::Get()->is_ready()) {
    args->ThrowError(
-        "protocol.registerSchemesAsPrivileged should be called before "
+        "protocol.registerStandardSchemes should be called before "
        "app is ready");
    return;
  }

-  atom::api::RegisterSchemesAsPrivileged(val, args);
+  atom::api::RegisterStandardSchemes(schemes, args);
 }

 void Initialize(v8::Local<v8::Object> exports,
@@ -310,7 +239,7 @@ void Initialize(v8::Local<v8::Object> exports,
                void* priv) {
  v8::Isolate* isolate = context->GetIsolate();
  mate::Dictionary dict(isolate, exports);
-  dict.SetMethod("registerSchemesAsPrivileged", &RegisterSchemesAsPrivileged);
+  dict.SetMethod("registerStandardSchemes", &RegisterStandardSchemes);
  dict.SetMethod("getStandardSchemes", &atom::api::GetStandardSchemes);
 }

--- a/atom/browser/api/atom_api_protocol.h
+++ b/atom/browser/api/atom_api_protocol.h
@@ -14,11 +14,8 @@
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/net/atom_url_request_job_factory.h"
-#include "atom/common/promise_util.h"
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "native_mate/arguments.h"
 #include "native_mate/dictionary.h"
@@ -34,15 +31,15 @@ namespace atom {
 namespace api {

 std::vector<std::string> GetStandardSchemes();
-
-void RegisterSchemesAsPrivileged(v8::Local<v8::Value> val,
-                                 mate::Arguments* args);
+void RegisterStandardSchemes(const std::vector<std::string>& schemes,
+                             mate::Arguments* args);

 class Protocol : public mate::TrackableObject<Protocol> {
 public:
  using Handler =
      base::Callback<void(const base::DictionaryValue&, v8::Local<v8::Value>)>;
  using CompletionCallback = base::Callback<void(v8::Local<v8::Value>)>;
+  using BooleanCallback = base::Callback<void(bool)>;

  static mate::Handle<Protocol> Create(v8::Isolate* isolate,
                                       AtomBrowserContext* browser_context);
@@ -95,6 +92,9 @@ class Protocol : public mate::TrackableObject<Protocol> {
    DISALLOW_COPY_AND_ASSIGN(CustomProtocolHandler);
  };

+  // Register schemes that can handle service worker.
+  void RegisterServiceWorkerSchemes(const std::vector<std::string>& schemes);
+
  // Register the protocol with certain request job.
  template <typename RequestJob>
  void RegisterProtocol(const std::string& scheme,
@@ -104,8 +104,8 @@ class Protocol : public mate::TrackableObject<Protocol> {
    args->GetNext(&callback);
    auto* getter = static_cast<URLRequestContextGetter*>(
        browser_context_->GetRequestContext());
-    base::PostTaskWithTraitsAndReplyWithResult(
-        FROM_HERE, {content::BrowserThread::IO},
+    content::BrowserThread::PostTaskAndReplyWithResult(
+        content::BrowserThread::IO, FROM_HERE,
        base::BindOnce(&Protocol::RegisterProtocolInIO<RequestJob>,
                       base::RetainedRef(getter), isolate(), scheme, handler),
        base::BindOnce(&Protocol::OnIOCompleted, GetWeakPtr(), callback));
@@ -134,7 +134,11 @@ class Protocol : public mate::TrackableObject<Protocol> {
      const std::string& scheme);

  // Whether the protocol has handler registered.
-  v8::Local<v8::Promise> IsProtocolHandled(const std::string& scheme);
+  void IsProtocolHandled(const std::string& scheme,
+                         const BooleanCallback& callback);
+  static bool IsProtocolHandledInIO(
+      scoped_refptr<URLRequestContextGetter> request_context_getter,
+      const std::string& scheme);

  // Replace the protocol handler with a new one.
  template <typename RequestJob>
@@ -145,8 +149,8 @@ class Protocol : public mate::TrackableObject<Protocol> {
    args->GetNext(&callback);
    auto* getter = static_cast<URLRequestContextGetter*>(
        browser_context_->GetRequestContext());
-    base::PostTaskWithTraitsAndReplyWithResult(
-        FROM_HERE, {content::BrowserThread::IO},
+    content::BrowserThread::PostTaskAndReplyWithResult(
+        content::BrowserThread::IO, FROM_HERE,
        base::BindOnce(&Protocol::InterceptProtocolInIO<RequestJob>,
                       base::RetainedRef(getter), isolate(), scheme, handler),
        base::BindOnce(&Protocol::OnIOCompleted, GetWeakPtr(), callback));
--- a/atom/browser/api/atom_api_render_process_preferences.cc
+++ b/atom/browser/api/atom_api_render_process_preferences.cc
@@ -26,7 +26,7 @@ bool IsWebContents(v8::Isolate* isolate, content::RenderProcessHost* process) {
  if (!web_contents)
    return false;

-  auto api_web_contents = WebContents::FromOrCreate(isolate, web_contents);
+  auto api_web_contents = WebContents::CreateFrom(isolate, web_contents);
  auto type = api_web_contents->GetType();
  return type == WebContents::Type::BROWSER_WINDOW ||
         type == WebContents::Type::WEB_VIEW;
--- a/atom/browser/api/atom_api_screen.cc
+++ b/atom/browser/api/atom_api_screen.cc
@@ -164,9 +164,7 @@ void Initialize(v8::Local<v8::Object> exports,
  v8::Isolate* isolate = context->GetIsolate();
  mate::Dictionary dict(isolate, exports);
  dict.Set("screen", Screen::Create(isolate));
-  dict.Set(
-      "Screen",
-      Screen::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
+  dict.Set("Screen", Screen::GetConstructor(isolate)->GetFunction());
 }

 }  // namespace
--- a/atom/browser/api/atom_api_session.cc
+++ b/atom/browser/api/atom_api_session.cc
@@ -19,7 +19,6 @@
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/atom_permission_manager.h"
 #include "atom/browser/browser.h"
-#include "atom/browser/media/media_device_id_salt.h"
 #include "atom/browser/net/atom_cert_verifier.h"
 #include "atom/browser/session_preferences.h"
 #include "atom/common/native_mate_converters/callback.h"
@@ -32,7 +31,7 @@
 #include "base/guid.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "base/task/post_task.h"
+#include "brightray/browser/media/media_device_id_salt.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/pref_names.h"
 #include "components/download/public/common/download_danger_type.h"
@@ -40,7 +39,6 @@
 #include "components/prefs/value_map_pref_store.h"
 #include "components/proxy_config/proxy_config_dictionary.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item_utils.h"
 #include "content/public/browser/download_manager_delegate.h"
@@ -213,12 +211,12 @@ std::map<uint32_t, v8::Global<v8::Object>> g_sessions;

 // Runs the callback in UI thread.
 void RunCallbackInUI(const base::Callback<void()>& callback) {
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, callback);
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
 }
 template <typename... T>
 void RunCallbackInUI(const base::Callback<void(T...)>& callback, T... result) {
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                           base::BindOnce(callback, result...));
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                          base::BindOnce(callback, result...));
 }

 // Callback of HttpCache::GetBackend.
@@ -361,7 +359,7 @@ void DestroyGlobalHandle(v8::Isolate* isolate,
  if (!global_handle.IsEmpty()) {
    v8::Local<v8::Value> local_handle = global_handle.Get(isolate);
    if (local_handle->IsObject()) {
-      v8::Local<v8::Object> object = local_handle->ToObject(isolate);
+      v8::Local<v8::Object> object = local_handle->ToObject();
      void* ptr = object->GetAlignedPointerFromInternalField(0);
      if (!ptr)
        return;
@@ -423,8 +421,8 @@ void Session::ResolveProxy(

 template <Session::CacheAction action>
 void Session::DoCacheAction(const net::CompletionCallback& callback) {
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
      base::BindOnce(&DoCacheActionInIO,
                     WrapRefCounted(browser_context_->GetRequestContext()),
                     action, callback));
@@ -442,11 +440,12 @@ void Session::ClearStorageData(mate::Arguments* args) {
  if (options.storage_types & StoragePartition::REMOVE_DATA_MASK_COOKIES) {
    // Reset media device id salt when cookies are cleared.
    // https://w3c.github.io/mediacapture-main/#dom-mediadeviceinfo-deviceid
-    MediaDeviceIDSalt::Reset(browser_context()->prefs());
+    brightray::MediaDeviceIDSalt::Reset(browser_context()->prefs());
  }
-  storage_partition->ClearData(options.storage_types, options.quota_types,
-                               options.origin, base::Time(), base::Time::Max(),
-                               base::Bind(&OnClearStorageDataDone, callback));
+  storage_partition->ClearData(
+      options.storage_types, options.quota_types, options.origin,
+      content::StoragePartition::OriginMatcherFunction(), base::Time(),
+      base::Time::Max(), base::Bind(&OnClearStorageDataDone, callback));
 }

 void Session::FlushStorageData() {
@@ -472,14 +471,13 @@ void Session::SetProxy(const mate::Dictionary& options,
  if (!pac_url.empty()) {
    browser_context_->in_memory_pref_store()->SetValue(
        proxy_config::prefs::kProxy,
-        std::make_unique<base::Value>(ProxyConfigDictionary::CreatePacScript(
-            pac_url, true /* pac_mandatory */)),
+        ProxyConfigDictionary::CreatePacScript(pac_url,
+                                               true /* pac_mandatory */),
        WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
  } else {
    browser_context_->in_memory_pref_store()->SetValue(
        proxy_config::prefs::kProxy,
-        std::make_unique<base::Value>(ProxyConfigDictionary::CreateFixedServers(
-            proxy_rules, bypass_list)),
+        ProxyConfigDictionary::CreateFixedServers(proxy_rules, bypass_list),
        WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
  }

@@ -534,8 +532,8 @@ void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
    return;
  }

-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
      base::BindOnce(&SetCertVerifyProcInIO,
                     WrapRefCounted(browser_context_->GetRequestContext()),
                     base::Bind(&WrapVerifyProc, proc)));
@@ -569,8 +567,8 @@ void Session::ClearHostResolverCache(mate::Arguments* args) {
  base::Closure callback;
  args->GetNext(&callback);

-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
      base::BindOnce(&ClearHostResolverCacheInIO,
                     WrapRefCounted(browser_context_->GetRequestContext()),
                     callback));
@@ -585,16 +583,16 @@ void Session::ClearAuthCache(mate::Arguments* args) {
  base::Closure callback;
  args->GetNext(&callback);

-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
      base::BindOnce(&ClearAuthCacheInIO,
                     WrapRefCounted(browser_context_->GetRequestContext()),
                     options, callback));
 }

 void Session::AllowNTLMCredentialsForDomains(const std::string& domains) {
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
      base::BindOnce(&AllowNTLMCredentialsForDomainsInIO,
                     WrapRefCounted(browser_context_->GetRequestContext()),
                     domains));
@@ -624,8 +622,8 @@ void Session::GetBlobData(const std::string& uuid,
    return;

  AtomBlobReader* blob_reader = browser_context()->GetBlobReader();
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
      base::BindOnce(&AtomBlobReader::StartReading,
                     base::Unretained(blob_reader), uuid, callback));
 }
@@ -804,12 +802,8 @@ void Initialize(v8::Local<v8::Object> exports,
                void* priv) {
  v8::Isolate* isolate = context->GetIsolate();
  mate::Dictionary dict(isolate, exports);
-  dict.Set(
-      "Session",
-      Session::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
-  dict.Set(
-      "Cookies",
-      Cookies::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
+  dict.Set("Session", Session::GetConstructor(isolate)->GetFunction());
+  dict.Set("Cookies", Cookies::GetConstructor(isolate)->GetFunction());
  dict.SetMethod("fromPartition", &FromPartition);
 }

--- a/atom/browser/api/atom_api_system_preferences.cc
+++ b/atom/browser/api/atom_api_system_preferences.cc
@@ -37,12 +37,6 @@ bool SystemPreferences::IsInvertedColorScheme() {
  return color_utils::IsInvertedColorScheme();
 }

-#if !defined(OS_WIN)
-bool SystemPreferences::IsHighContrastColorScheme() {
-  return false;
-}
-#endif  // !defined(OS_WIN)
-
 // static
 mate::Handle<SystemPreferences> SystemPreferences::Create(
    v8::Isolate* isolate) {
@@ -55,13 +49,10 @@ void SystemPreferences::BuildPrototype(
    v8::Local<v8::FunctionTemplate> prototype) {
  prototype->SetClassName(mate::StringToV8(isolate, "SystemPreferences"));
  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-#if defined(OS_WIN) || defined(OS_MACOSX)
-      .SetMethod("getColor", &SystemPreferences::GetColor)
-      .SetMethod("getAccentColor", &SystemPreferences::GetAccentColor)
-#endif
-
 #if defined(OS_WIN)
+      .SetMethod("getAccentColor", &SystemPreferences::GetAccentColor)
      .SetMethod("isAeroGlassEnabled", &SystemPreferences::IsAeroGlassEnabled)
+      .SetMethod("getColor", &SystemPreferences::GetColor)
 #elif defined(OS_MACOSX)
      .SetMethod("postNotification", &SystemPreferences::PostNotification)
      .SetMethod("subscribeNotification",
@@ -92,17 +83,9 @@ void SystemPreferences::BuildPrototype(
                 &SystemPreferences::GetAppLevelAppearance)
      .SetMethod("setAppLevelAppearance",
                 &SystemPreferences::SetAppLevelAppearance)
-      .SetMethod("getSystemColor", &SystemPreferences::GetSystemColor)
-      .SetMethod("isTrustedAccessibilityClient",
-                 &SystemPreferences::IsTrustedAccessibilityClient)
-      .SetMethod("getMediaAccessStatus",
-                 &SystemPreferences::GetMediaAccessStatus)
-      .SetMethod("askForMediaAccess", &SystemPreferences::AskForMediaAccess)
 #endif
      .SetMethod("isInvertedColorScheme",
                 &SystemPreferences::IsInvertedColorScheme)
-      .SetMethod("isHighContrastColorScheme",
-                 &SystemPreferences::IsHighContrastColorScheme)
      .SetMethod("isDarkMode", &SystemPreferences::IsDarkMode);
 }

@@ -121,9 +104,8 @@ void Initialize(v8::Local<v8::Object> exports,
  v8::Isolate* isolate = context->GetIsolate();
  mate::Dictionary dict(isolate, exports);
  dict.Set("systemPreferences", SystemPreferences::Create(isolate));
-  dict.Set("SystemPreferences", SystemPreferences::GetConstructor(isolate)
-                                    ->GetFunction(context)
-                                    .ToLocalChecked());
+  dict.Set("SystemPreferences",
+           SystemPreferences::GetConstructor(isolate)->GetFunction());
 }

 }  // namespace
--- a/atom/browser/api/atom_api_system_preferences.h
+++ b/atom/browser/api/atom_api_system_preferences.h
@@ -9,7 +9,6 @@
 #include <string>

 #include "atom/browser/api/event_emitter.h"
-#include "atom/common/promise_util.h"
 #include "base/callback.h"
 #include "base/values.h"
 #include "native_mate/handle.h"
@@ -49,13 +48,12 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
  static void BuildPrototype(v8::Isolate* isolate,
                             v8::Local<v8::FunctionTemplate> prototype);

-#if defined(OS_WIN) || defined(OS_MACOSX)
-  std::string GetAccentColor();
-  std::string GetColor(const std::string& color, mate::Arguments* args);
-#endif
 #if defined(OS_WIN)
  bool IsAeroGlassEnabled();

+  std::string GetAccentColor();
+  std::string GetColor(const std::string& color, mate::Arguments* args);
+
  void InitializeWindow();

  // gfx::SysColorChangeListener:
@@ -69,8 +67,7 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
      base::Callback<void(const std::string&, const base::DictionaryValue&)>;

  void PostNotification(const std::string& name,
-                        const base::DictionaryValue& user_info,
-                        mate::Arguments* args);
+                        const base::DictionaryValue& user_info);
  int SubscribeNotification(const std::string& name,
                            const NotificationCallback& callback);
  void UnsubscribeNotification(int id);
@@ -93,17 +90,6 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
  void RemoveUserDefault(const std::string& name);
  bool IsSwipeTrackingFromScrollEventsEnabled();

-  std::string GetSystemColor(const std::string& color, mate::Arguments* args);
-
-  static bool IsTrustedAccessibilityClient(bool prompt);
-
-  // TODO(codebytere): Write tests for these methods once we
-  // are running tests on a Mojave machine
-  std::string GetMediaAccessStatus(const std::string& media_type,
-                                   mate::Arguments* args);
-  v8::Local<v8::Promise> AskForMediaAccess(v8::Isolate* isolate,
-                                           const std::string& media_type);
-
  // TODO(MarshallOfSound): Write tests for these methods once we
  // are running tests on a Mojave machine
  v8::Local<v8::Value> GetEffectiveAppearance(v8::Isolate* isolate);
@@ -112,13 +98,15 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
 #endif
  bool IsDarkMode();
  bool IsInvertedColorScheme();
-  bool IsHighContrastColorScheme();

 protected:
  explicit SystemPreferences(v8::Isolate* isolate);
  ~SystemPreferences() override;

 #if defined(OS_MACOSX)
+  void DoPostNotification(const std::string& name,
+                          const base::DictionaryValue& user_info,
+                          NotificationCenterKind kind);
  int DoSubscribeNotification(const std::string& name,
                              const NotificationCallback& callback,
                              NotificationCenterKind kind);
@@ -151,8 +139,6 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>

  bool invertered_color_scheme_;

-  bool high_contrast_color_scheme_;
-
  std::unique_ptr<gfx::ScopedSysColorChangeListener> color_change_listener_;
 #endif
  DISALLOW_COPY_AND_ASSIGN(SystemPreferences);
--- a/atom/browser/api/atom_api_system_preferences_mac.mm
+++ b/atom/browser/api/atom_api_system_preferences_mac.mm
@@ -6,15 +6,12 @@

 #include <map>

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

 #include "atom/browser/mac/atom_application.h"
 #include "atom/browser/mac/dict_util.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "base/mac/sdk_forward_declarations.h"
-#include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
 #include "native_mate/object_template_builder.h"
@@ -81,60 +78,12 @@ int g_next_id = 0;
 // The map to convert |id| to |int|.
 std::map<int, id> g_id_map;

-AVMediaType ParseMediaType(const std::string& media_type) {
-  if (media_type == "camera") {
-    return AVMediaTypeVideo;
-  } else if (media_type == "microphone") {
-    return AVMediaTypeAudio;
-  } else {
-    return nil;
-  }
-}
-
-std::string ConvertAuthorizationStatus(AVAuthorizationStatusMac status) {
-  switch (status) {
-    case AVAuthorizationStatusNotDeterminedMac:
-      return "not-determined";
-    case AVAuthorizationStatusRestrictedMac:
-      return "restricted";
-    case AVAuthorizationStatusDeniedMac:
-      return "denied";
-    case AVAuthorizationStatusAuthorizedMac:
-      return "granted";
-    default:
-      return "unknown";
-  }
-}
-
-// Convert color to RGBA value like "aabbccdd"
-std::string ToRGBA(NSColor* color) {
-  return base::StringPrintf(
-      "%02X%02X%02X%02X", (int)(color.redComponent * 0xFF),
-      (int)(color.greenComponent * 0xFF), (int)(color.blueComponent * 0xFF),
-      (int)(color.alphaComponent * 0xFF));
-}
-
-// Convert color to RGB hex value like "#ABCDEF"
-std::string ToRGBHex(NSColor* color) {
-  return base::StringPrintf("#%02X%02X%02X", (int)(color.redComponent * 0xFF),
-                            (int)(color.greenComponent * 0xFF),
-                            (int)(color.blueComponent * 0xFF));
-}
-
 }  // namespace

-void SystemPreferences::PostNotification(const std::string& name,
-                                         const base::DictionaryValue& user_info,
-                                         mate::Arguments* args) {
-  bool immediate = false;
-  args->GetNext(&immediate);
-
-  NSDistributedNotificationCenter* center =
-      [NSDistributedNotificationCenter defaultCenter];
-  [center postNotificationName:base::SysUTF8ToNSString(name)
-                        object:nil
-                      userInfo:DictionaryValueToNSDictionary(user_info)
-            deliverImmediately:immediate];
+void SystemPreferences::PostNotification(
+    const std::string& name,
+    const base::DictionaryValue& user_info) {
+  DoPostNotification(name, user_info, kNSDistributedNotificationCenter);
 }

 int SystemPreferences::SubscribeNotification(
@@ -151,10 +100,7 @@ void SystemPreferences::UnsubscribeNotification(int request_id) {
 void SystemPreferences::PostLocalNotification(
    const std::string& name,
    const base::DictionaryValue& user_info) {
-  NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
-  [center postNotificationName:base::SysUTF8ToNSString(name)
-                        object:nil
-                      userInfo:DictionaryValueToNSDictionary(user_info)];
+  DoPostNotification(name, user_info, kNSNotificationCenter);
 }

 int SystemPreferences::SubscribeLocalNotification(
@@ -170,11 +116,7 @@ void SystemPreferences::UnsubscribeLocalNotification(int request_id) {
 void SystemPreferences::PostWorkspaceNotification(
    const std::string& name,
    const base::DictionaryValue& user_info) {
-  NSNotificationCenter* center =
-      [[NSWorkspace sharedWorkspace] notificationCenter];
-  [center postNotificationName:base::SysUTF8ToNSString(name)
-                        object:nil
-                      userInfo:DictionaryValueToNSDictionary(user_info)];
+  DoPostNotification(name, user_info, kNSWorkspaceNotificationCenter);
 }

 int SystemPreferences::SubscribeWorkspaceNotification(
@@ -188,6 +130,29 @@ void SystemPreferences::UnsubscribeWorkspaceNotification(int request_id) {
  DoUnsubscribeNotification(request_id, kNSWorkspaceNotificationCenter);
 }

+void SystemPreferences::DoPostNotification(
+    const std::string& name,
+    const base::DictionaryValue& user_info,
+    NotificationCenterKind kind) {
+  NSNotificationCenter* center;
+  switch (kind) {
+    case kNSDistributedNotificationCenter:
+      center = [NSDistributedNotificationCenter defaultCenter];
+      break;
+    case kNSNotificationCenter:
+      center = [NSNotificationCenter defaultCenter];
+      break;
+    case kNSWorkspaceNotificationCenter:
+      center = [[NSWorkspace sharedWorkspace] notificationCenter];
+      break;
+    default:
+      break;
+  }
+  [center postNotificationName:base::SysUTF8ToNSString(name)
+                        object:nil
+                      userInfo:DictionaryValueToNSDictionary(user_info)];
+}
+
 int SystemPreferences::DoSubscribeNotification(
    const std::string& name,
    const NotificationCallback& callback,
@@ -395,186 +360,6 @@ void SystemPreferences::SetUserDefault(const std::string& name,
  }
 }

-std::string SystemPreferences::GetAccentColor() {
-  NSColor* sysColor = nil;
-  if (@available(macOS 10.14, *))
-    sysColor = [NSColor controlAccentColor];
-
-  return ToRGBA(sysColor);
-}
-
-std::string SystemPreferences::GetSystemColor(const std::string& color,
-                                              mate::Arguments* args) {
-  if (@available(macOS 10.10, *)) {
-    NSColor* sysColor;
-    if (color == "blue") {
-      sysColor = [NSColor systemBlueColor];
-    } else if (color == "brown") {
-      sysColor = [NSColor systemBrownColor];
-    } else if (color == "gray") {
-      sysColor = [NSColor systemGrayColor];
-    } else if (color == "green") {
-      sysColor = [NSColor systemGreenColor];
-    } else if (color == "orange") {
-      sysColor = [NSColor systemOrangeColor];
-    } else if (color == "pink") {
-      sysColor = [NSColor systemPinkColor];
-    } else if (color == "purple") {
-      sysColor = [NSColor systemPurpleColor];
-    } else if (color == "red") {
-      sysColor = [NSColor systemRedColor];
-    } else if (color == "yellow") {
-      sysColor = [NSColor systemYellowColor];
-    } else {
-      args->ThrowError("Unknown system color: " + color);
-      return "";
-    }
-
-    return ToRGBHex(sysColor);
-  } else {
-    args->ThrowError(
-        "This api is not available on MacOS version 10.9 or lower.");
-    return "";
-  }
-}
-
-// static
-bool SystemPreferences::IsTrustedAccessibilityClient(bool prompt) {
-  NSDictionary* options = @{(id)kAXTrustedCheckOptionPrompt : @(prompt)};
-  return AXIsProcessTrustedWithOptions((CFDictionaryRef)options);
-}
-
-std::string SystemPreferences::GetColor(const std::string& color,
-                                        mate::Arguments* args) {
-  NSColor* sysColor = nil;
-  if (color == "alternate-selected-control-text") {
-    sysColor = [NSColor alternateSelectedControlTextColor];
-  } else if (color == "control-background") {
-    sysColor = [NSColor controlBackgroundColor];
-  } else if (color == "control") {
-    sysColor = [NSColor controlColor];
-  } else if (color == "control-text") {
-    sysColor = [NSColor controlTextColor];
-  } else if (color == "disabled-control") {
-    sysColor = [NSColor disabledControlTextColor];
-  } else if (color == "find-highlight") {
-    if (@available(macOS 10.14, *))
-      sysColor = [NSColor findHighlightColor];
-  } else if (color == "grid") {
-    sysColor = [NSColor gridColor];
-  } else if (color == "header-text") {
-    sysColor = [NSColor headerTextColor];
-  } else if (color == "highlight") {
-    sysColor = [NSColor highlightColor];
-  } else if (color == "keyboard-focus-indicator") {
-    sysColor = [NSColor keyboardFocusIndicatorColor];
-  } else if (color == "label") {
-    if (@available(macOS 10.10, *))
-      sysColor = [NSColor labelColor];
-  } else if (color == "link") {
-    if (@available(macOS 10.10, *))
-      sysColor = [NSColor linkColor];
-  } else if (color == "placeholder-text") {
-    if (@available(macOS 10.10, *))
-      sysColor = [NSColor placeholderTextColor];
-  } else if (color == "quaternary-label") {
-    if (@available(macOS 10.10, *))
-      sysColor = [NSColor quaternaryLabelColor];
-  } else if (color == "scrubber-textured-background") {
-    if (@available(macOS 10.12.2, *))
-      sysColor = [NSColor scrubberTexturedBackgroundColor];
-  } else if (color == "secondary-label") {
-    if (@available(macOS 10.10, *))
-      sysColor = [NSColor secondaryLabelColor];
-  } else if (color == "selected-content-background") {
-    if (@available(macOS 10.14, *))
-      sysColor = [NSColor selectedContentBackgroundColor];
-  } else if (color == "selected-control") {
-    sysColor = [NSColor selectedControlColor];
-  } else if (color == "selected-control-text") {
-    sysColor = [NSColor selectedControlTextColor];
-  } else if (color == "selected-menu-item-text") {
-    sysColor = [NSColor selectedMenuItemTextColor];
-  } else if (color == "selected-text-background") {
-    sysColor = [NSColor selectedTextBackgroundColor];
-  } else if (color == "selected-text") {
-    sysColor = [NSColor selectedTextColor];
-  } else if (color == "separator") {
-    if (@available(macOS 10.14, *))
-      sysColor = [NSColor separatorColor];
-  } else if (color == "shadow") {
-    sysColor = [NSColor shadowColor];
-  } else if (color == "tertiary-label") {
-    if (@available(macOS 10.10, *))
-      sysColor = [NSColor tertiaryLabelColor];
-  } else if (color == "text-background") {
-    sysColor = [NSColor textBackgroundColor];
-  } else if (color == "text") {
-    sysColor = [NSColor textColor];
-  } else if (color == "under-page-background") {
-    sysColor = [NSColor underPageBackgroundColor];
-  } else if (color == "unemphasized-selected-content-background") {
-    if (@available(macOS 10.14, *))
-      sysColor = [NSColor unemphasizedSelectedContentBackgroundColor];
-  } else if (color == "unemphasized-selected-text-background") {
-    if (@available(macOS 10.14, *))
-      sysColor = [NSColor unemphasizedSelectedTextBackgroundColor];
-  } else if (color == "unemphasized-selected-text") {
-    if (@available(macOS 10.14, *))
-      sysColor = [NSColor unemphasizedSelectedTextColor];
-  } else if (color == "window-background") {
-    sysColor = [NSColor windowBackgroundColor];
-  } else if (color == "window-frame-text") {
-    sysColor = [NSColor windowFrameTextColor];
-  } else {
-    args->ThrowError("Unknown color: " + color);
-    return "";
-  }
-
-  return ToRGBHex(sysColor);
-}
-
-std::string SystemPreferences::GetMediaAccessStatus(
-    const std::string& media_type,
-    mate::Arguments* args) {
-  if (auto type = ParseMediaType(media_type)) {
-    if (@available(macOS 10.14, *)) {
-      return ConvertAuthorizationStatus(
-          [AVCaptureDevice authorizationStatusForMediaType:type]);
-    } else {
-      // access always allowed pre-10.14 Mojave
-      return ConvertAuthorizationStatus(AVAuthorizationStatusAuthorizedMac);
-    }
-  } else {
-    args->ThrowError("Invalid media type");
-    return std::string();
-  }
-}
-
-v8::Local<v8::Promise> SystemPreferences::AskForMediaAccess(
-    v8::Isolate* isolate,
-    const std::string& media_type) {
-  scoped_refptr<util::Promise> promise = new util::Promise(isolate);
-
-  if (auto type = ParseMediaType(media_type)) {
-    if (@available(macOS 10.14, *)) {
-      [AVCaptureDevice requestAccessForMediaType:type
-                               completionHandler:^(BOOL granted) {
-                                 dispatch_async(dispatch_get_main_queue(), ^{
-                                   promise->Resolve(!!granted);
-                                 });
-                               }];
-    } else {
-      // access always allowed pre-10.14 Mojave
-      promise->Resolve(true);
-    }
-  } else {
-    promise->RejectWithErrorMessage("Invalid media type");
-  }
-
-  return promise->GetHandle();
-}
-
 void SystemPreferences::RemoveUserDefault(const std::string& name) {
  NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
  [defaults removeObjectForKey:base::SysUTF8ToNSString(name)];
--- a/atom/browser/api/atom_api_system_preferences_win.cc
+++ b/atom/browser/api/atom_api_system_preferences_win.cc
@@ -20,18 +20,6 @@ namespace {
 const wchar_t kSystemPreferencesWindowClass[] =
    L"Electron_SystemPreferencesHostWindow";

-bool g_is_high_contract_color_scheme = false;
-bool g_is_high_contract_color_scheme_initialized = false;
-
-void UpdateHighContrastColorScheme() {
-  HIGHCONTRAST high_contrast = {0};
-  high_contrast.cbSize = sizeof(HIGHCONTRAST);
-  g_is_high_contract_color_scheme =
-      SystemParametersInfo(SPI_GETHIGHCONTRAST, 0, &high_contrast, 0) &&
-      ((high_contrast.dwFlags & HCF_HIGHCONTRASTON) != 0);
-  g_is_high_contract_color_scheme_initialized = true;
-}
-
 }  // namespace

 namespace api {
@@ -40,12 +28,6 @@ bool SystemPreferences::IsAeroGlassEnabled() {
  return ui::win::IsAeroGlassEnabled();
 }

-bool SystemPreferences::IsHighContrastColorScheme() {
-  if (!g_is_high_contract_color_scheme_initialized)
-    UpdateHighContrastColorScheme();
-  return g_is_high_contract_color_scheme;
-}
-
 std::string hexColorDWORDToRGBA(DWORD color) {
  DWORD rgba = color << 8 | color >> 24;
  std::ostringstream stream;
@@ -137,7 +119,6 @@ std::string SystemPreferences::GetColor(const std::string& color,

 void SystemPreferences::InitializeWindow() {
  invertered_color_scheme_ = IsInvertedColorScheme();
-  high_contrast_color_scheme_ = IsHighContrastColorScheme();

  // Wait until app is ready before creating sys color listener
  // Creating this listener before the app is ready causes global shortcuts
@@ -188,9 +169,6 @@ LRESULT CALLBACK SystemPreferences::WndProc(HWND hwnd,
      Emit("accent-color-changed", hexColorDWORDToRGBA(new_color));
      current_color_ = new_color_string;
    }
-  } else if (message == WM_SYSCOLORCHANGE ||
-             (message == WM_SETTINGCHANGE && wparam == SPI_SETHIGHCONTRAST)) {
-    UpdateHighContrastColorScheme();
  }
  return ::DefWindowProc(hwnd, message, wparam, lparam);
 }
@@ -201,13 +179,6 @@ void SystemPreferences::OnSysColorChange() {
    invertered_color_scheme_ = new_invertered_color_scheme;
    Emit("inverted-color-scheme-changed", new_invertered_color_scheme);
  }
-
-  bool new_high_contrast_color_scheme = IsHighContrastColorScheme();
-  if (new_high_contrast_color_scheme != high_contrast_color_scheme_) {
-    high_contrast_color_scheme_ = new_high_contrast_color_scheme;
-    Emit("high-contrast-color-scheme-changed", new_high_contrast_color_scheme);
-  }
-
  Emit("color-changed");
 }

--- a/atom/browser/api/atom_api_top_level_window.cc
+++ b/atom/browser/api/atom_api_top_level_window.cc
@@ -20,7 +20,6 @@
 #include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/options_switches.h"
 #include "electron/buildflags/buildflags.h"
-#include "gin/converter.h"
 #include "native_mate/handle.h"
 #include "native_mate/persistent_dictionary.h"

@@ -159,7 +158,7 @@ void TopLevelWindow::OnWindowClosed() {
  Emit("closed");

  RemoveFromParentChildWindows();
-  TopLevelWindow::ResetBrowserViews();
+  ResetBrowserView();

  // Destroy the native class when window is closed.
  base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, GetDestroyClosure());
@@ -267,7 +266,7 @@ void TopLevelWindow::OnWindowAlwaysOnTopChanged() {
  Emit("always-on-top-changed", IsAlwaysOnTop());
 }

-void TopLevelWindow::OnExecuteAppCommand(const std::string& command_name) {
+void TopLevelWindow::OnExecuteWindowsCommand(const std::string& command_name) {
  Emit("app-command", command_name);
 }

@@ -294,7 +293,6 @@ void TopLevelWindow::OnWindowMessage(UINT message,
 #endif

 void TopLevelWindow::SetContentView(mate::Handle<View> view) {
-  ResetBrowserViews();
  content_view_.Reset(isolate(), view.ToV8());
  window_->SetContentView(view->view());
 }
@@ -645,8 +643,7 @@ void TopLevelWindow::SetFocusable(bool focusable) {
 void TopLevelWindow::SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> value) {
  mate::Handle<Menu> menu;
  if (value->IsObject() &&
-      gin::V8ToString(
-          isolate, value->ToObject(isolate)->GetConstructorName()) == "Menu" &&
+      mate::V8ToString(value->ToObject()->GetConstructorName()) == "Menu" &&
      mate::ConvertFromV8(isolate, value, &menu) && !menu.IsEmpty()) {
    menu_.Reset(isolate, menu.ToV8());
    window_->SetMenu(menu->model());
@@ -672,7 +669,6 @@ void TopLevelWindow::SetParentWindow(v8::Local<v8::Value> value,
    parent_window_.Reset();
    window_->SetParentWindow(nullptr);
  } else if (mate::ConvertFromV8(isolate(), value, &parent)) {
-    RemoveFromParentChildWindows();
    parent_window_.Reset(isolate(), value);
    window_->SetParentWindow(parent->window_.get());
    parent->child_windows_.Set(isolate(), weak_map_id(), GetWrapper());
@@ -682,43 +678,21 @@ void TopLevelWindow::SetParentWindow(v8::Local<v8::Value> value,
 }

 void TopLevelWindow::SetBrowserView(v8::Local<v8::Value> value) {
-  ResetBrowserViews();
-  AddBrowserView(value);
-}
+  ResetBrowserView();

-void TopLevelWindow::AddBrowserView(v8::Local<v8::Value> value) {
  mate::Handle<BrowserView> browser_view;
-  if (value->IsObject() &&
-      mate::ConvertFromV8(isolate(), value, &browser_view)) {
-    auto get_that_view = browser_views_.find(browser_view->weak_map_id());
-    if (get_that_view == browser_views_.end()) {
-      window_->AddBrowserView(browser_view->view());
-      browser_view->web_contents()->SetOwnerWindow(window_.get());
-      browser_views_[browser_view->weak_map_id()].Reset(isolate(), value);
-    }
+  if (value->IsNull() || value->IsUndefined()) {
+    window_->SetBrowserView(nullptr);
+  } else if (mate::ConvertFromV8(isolate(), value, &browser_view)) {
+    window_->SetBrowserView(browser_view->view());
+    browser_view->web_contents()->SetOwnerWindow(window_.get());
+    browser_view_.Reset(isolate(), value);
  }
 }

-void TopLevelWindow::RemoveBrowserView(v8::Local<v8::Value> value) {
-  mate::Handle<BrowserView> browser_view;
-  if (value->IsObject() &&
-      mate::ConvertFromV8(isolate(), value, &browser_view)) {
-    auto get_that_view = browser_views_.find(browser_view->weak_map_id());
-    if (get_that_view != browser_views_.end()) {
-      window_->RemoveBrowserView(browser_view->view());
-      browser_view->web_contents()->SetOwnerWindow(nullptr);
-
-      (*get_that_view).second.Reset(isolate(), value);
-      browser_views_.erase(get_that_view);
-    }
-  }
-}
 v8::Local<v8::Value> TopLevelWindow::GetNativeWindowHandle() {
-  // TODO(MarshallOfSound): Replace once
-  // https://chromium-review.googlesource.com/c/chromium/src/+/1253094/ has
-  // landed
-  NativeWindowHandle handle = window_->GetNativeWindowHandle();
-  return ToBuffer(isolate(), &handle, sizeof(handle));
+  gfx::AcceleratedWidget handle = window_->GetAcceleratedWidget();
+  return ToBuffer(isolate(), static_cast<void*>(&handle), sizeof(handle));
 }

 void TopLevelWindow::SetProgressBar(double progress, mate::Arguments* args) {
@@ -763,7 +737,7 @@ void TopLevelWindow::SetAutoHideCursor(bool auto_hide) {

 void TopLevelWindow::SetVibrancy(v8::Isolate* isolate,
                                 v8::Local<v8::Value> value) {
-  std::string type = gin::V8ToString(isolate, value);
+  std::string type = mate::V8ToString(value);
  window_->SetVibrancy(type);
 }

@@ -867,29 +841,12 @@ std::vector<v8::Local<v8::Object>> TopLevelWindow::GetChildWindows() const {
  return child_windows_.Values(isolate());
 }

-v8::Local<v8::Value> TopLevelWindow::GetBrowserView(
-    mate::Arguments* args) const {
-  if (browser_views_.size() == 0) {
-    return v8::Null(isolate());
-  } else if (browser_views_.size() == 1) {
-    auto first_view = browser_views_.begin();
-    return v8::Local<v8::Value>::New(isolate(), (*first_view).second);
-  } else {
-    args->ThrowError(
-        "BrowserWindow have multiple BrowserViews, "
-        "Use getBrowserViews() instead");
+v8::Local<v8::Value> TopLevelWindow::GetBrowserView() const {
+  if (browser_view_.IsEmpty()) {
    return v8::Null(isolate());
  }
-}

-std::vector<v8::Local<v8::Value>> TopLevelWindow::GetBrowserViews() const {
-  std::vector<v8::Local<v8::Value>> ret;
-
-  for (auto const& views_iter : browser_views_) {
-    ret.push_back(v8::Local<v8::Value>::New(isolate(), views_iter.second));
-  }
-
-  return ret;
+  return v8::Local<v8::Value>::New(isolate(), browser_view_);
 }

 bool TopLevelWindow::IsModal() const {
@@ -981,21 +938,17 @@ int32_t TopLevelWindow::GetID() const {
  return weak_map_id();
 }

-void TopLevelWindow::ResetBrowserViews() {
-  for (auto& item : browser_views_) {
-    mate::Handle<BrowserView> browser_view;
-    if (mate::ConvertFromV8(isolate(),
-                            v8::Local<v8::Value>::New(isolate(), item.second),
-                            &browser_view) &&
-        !browser_view.IsEmpty()) {
-      window_->RemoveBrowserView(browser_view->view());
-      browser_view->web_contents()->SetOwnerWindow(nullptr);
-    }
+void TopLevelWindow::ResetBrowserView() {
+  if (browser_view_.IsEmpty())
+    return;

-    item.second.Reset();
+  mate::Handle<BrowserView> browser_view;
+  if (mate::ConvertFromV8(isolate(), GetBrowserView(), &browser_view) &&
+      !browser_view.IsEmpty()) {
+    browser_view->web_contents()->SetOwnerWindow(nullptr);
  }

-  browser_views_.clear();
+  browser_view_.Reset();
 }

 void TopLevelWindow::RemoveFromParentChildWindows() {
@@ -1103,10 +1056,10 @@ void TopLevelWindow::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("setContentProtection", &TopLevelWindow::SetContentProtection)
      .SetMethod("setFocusable", &TopLevelWindow::SetFocusable)
      .SetMethod("setMenu", &TopLevelWindow::SetMenu)
+#if !defined(OS_WIN)
      .SetMethod("setParentWindow", &TopLevelWindow::SetParentWindow)
+#endif
      .SetMethod("setBrowserView", &TopLevelWindow::SetBrowserView)
-      .SetMethod("addBrowserView", &TopLevelWindow::AddBrowserView)
-      .SetMethod("removeBrowserView", &TopLevelWindow::RemoveBrowserView)
      .SetMethod("getNativeWindowHandle",
                 &TopLevelWindow::GetNativeWindowHandle)
      .SetMethod("setProgressBar", &TopLevelWindow::SetProgressBar)
@@ -1144,7 +1097,6 @@ void TopLevelWindow::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("getParentWindow", &TopLevelWindow::GetParentWindow)
      .SetMethod("getChildWindows", &TopLevelWindow::GetChildWindows)
      .SetMethod("getBrowserView", &TopLevelWindow::GetBrowserView)
-      .SetMethod("getBrowserViews", &TopLevelWindow::GetBrowserViews)
      .SetMethod("isModal", &TopLevelWindow::IsModal)
      .SetMethod("setThumbarButtons", &TopLevelWindow::SetThumbarButtons)
 #if defined(TOOLKIT_VIEWS)
@@ -1179,9 +1131,8 @@ void Initialize(v8::Local<v8::Object> exports,
  v8::Isolate* isolate = context->GetIsolate();
  TopLevelWindow::SetConstructor(isolate, base::Bind(&TopLevelWindow::New));

-  mate::Dictionary constructor(isolate, TopLevelWindow::GetConstructor(isolate)
-                                            ->GetFunction(context)
-                                            .ToLocalChecked());
+  mate::Dictionary constructor(
+      isolate, TopLevelWindow::GetConstructor(isolate)->GetFunction());
  constructor.SetMethod("fromId",
                        &mate::TrackableObject<TopLevelWindow>::FromWeakMapID);
  constructor.SetMethod("getAllWindows",
--- a/atom/browser/api/atom_api_top_level_window.h
+++ b/atom/browser/api/atom_api_top_level_window.h
@@ -14,8 +14,6 @@
 #include "atom/browser/native_window.h"
 #include "atom/browser/native_window_observer.h"
 #include "atom/common/api/atom_api_native_image.h"
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "native_mate/handle.h"

@@ -80,7 +78,7 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
  void OnWindowEnterHtmlFullScreen() override;
  void OnWindowLeaveHtmlFullScreen() override;
  void OnWindowAlwaysOnTopChanged() override;
-  void OnExecuteAppCommand(const std::string& command_name) override;
+  void OnExecuteWindowsCommand(const std::string& command_name) override;
  void OnTouchBarItemResult(const std::string& item_id,
                            const base::DictionaryValue& details) override;
  void OnNewWindowForTab() override;
@@ -167,10 +165,6 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
  void SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> menu);
  void SetParentWindow(v8::Local<v8::Value> value, mate::Arguments* args);
  virtual void SetBrowserView(v8::Local<v8::Value> value);
-  virtual void AddBrowserView(v8::Local<v8::Value> value);
-  virtual void RemoveBrowserView(v8::Local<v8::Value> value);
-  virtual std::vector<v8::Local<v8::Value>> GetBrowserViews() const;
-  virtual void ResetBrowserViews();
  v8::Local<v8::Value> GetNativeWindowHandle();
  void SetProgressBar(double progress, mate::Arguments* args);
  void SetOverlayIcon(const gfx::Image& overlay,
@@ -201,7 +195,7 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
  v8::Local<v8::Value> GetContentView() const;
  v8::Local<v8::Value> GetParentWindow() const;
  std::vector<v8::Local<v8::Object>> GetChildWindows() const;
-  v8::Local<v8::Value> GetBrowserView(mate::Arguments* args) const;
+  v8::Local<v8::Value> GetBrowserView() const;
  bool IsModal() const;

  // Extra APIs added in JS.
@@ -232,8 +226,8 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,

  template <typename... Args>
  void EmitEventSoon(base::StringPiece eventName) {
-    base::PostTaskWithTraits(
-        FROM_HERE, {content::BrowserThread::UI},
+    content::BrowserThread::PostTask(
+        content::BrowserThread::UI, FROM_HERE,
        base::BindOnce(base::IgnoreResult(&TopLevelWindow::Emit<Args...>),
                       weak_factory_.GetWeakPtr(), eventName));
  }
@@ -244,7 +238,7 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
 #endif

  v8::Global<v8::Value> content_view_;
-  std::map<int32_t, v8::Global<v8::Value>> browser_views_;
+  v8::Global<v8::Value> browser_view_;
  v8::Global<v8::Value> menu_;
  v8::Global<v8::Value> parent_window_;
  KeyWeakMap<int> child_windows_;
--- a/atom/browser/api/atom_api_tray.cc
+++ b/atom/browser/api/atom_api_tray.cc
@@ -254,9 +254,7 @@ void Initialize(v8::Local<v8::Object> exports,
  Tray::SetConstructor(isolate, base::Bind(&Tray::New));

  mate::Dictionary dict(isolate, exports);
-  dict.Set(
-      "Tray",
-      Tray::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
+  dict.Set("Tray", Tray::GetConstructor(isolate)->GetFunction());
 }

 }  // namespace
--- a/atom/browser/api/atom_api_view.cc
+++ b/atom/browser/api/atom_api_view.cc
@@ -76,9 +76,8 @@ void Initialize(v8::Local<v8::Object> exports,
  v8::Isolate* isolate = context->GetIsolate();
  View::SetConstructor(isolate, base::Bind(&View::New));

-  mate::Dictionary constructor(
-      isolate,
-      View::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());
+  mate::Dictionary constructor(isolate,
+                               View::GetConstructor(isolate)->GetFunction());

  mate::Dictionary dict(isolate, exports);
  dict.Set("View", constructor);
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -17,14 +17,11 @@
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/atom_javascript_dialog_manager.h"
 #include "atom/browser/atom_navigation_throttle.h"
-#include "atom/browser/browser.h"
 #include "atom/browser/child_web_contents_tracker.h"
 #include "atom/browser/lib/bluetooth_chooser.h"
 #include "atom/browser/native_window.h"
 #include "atom/browser/net/atom_network_delegate.h"
 #include "atom/browser/ui/drag_util.h"
-#include "atom/browser/ui/inspectable_web_contents.h"
-#include "atom/browser/ui/inspectable_web_contents_view.h"
 #include "atom/browser/web_contents_permission_helper.h"
 #include "atom/browser/web_contents_preferences.h"
 #include "atom/browser/web_contents_zoom_controller.h"
@@ -47,18 +44,21 @@
 #include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/options_switches.h"
 #include "base/message_loop/message_loop.h"
-#include "base/no_destructor.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
+#include "brightray/browser/inspectable_web_contents.h"
+#include "brightray/browser/inspectable_web_contents_view.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/printing/print_preview_message_handler.h"
+#include "chrome/browser/printing/print_view_manager_basic.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/render_frame_host_manager.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
-#include "content/common/widget_messages.h"
+#include "content/common/view_messages.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/download_request_utils.h"
 #include "content/public/browser/favicon_status.h"
@@ -81,8 +81,8 @@
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 #include "net/url_request/url_request_context.h"
-#include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
 #include "third_party/blink/public/platform/web_input_event.h"
+#include "third_party/blink/public/web/web_find_options.h"
 #include "ui/display/screen.h"
 #include "ui/events/base_event_utils.h"

@@ -101,16 +101,34 @@
 #include "ui/gfx/font_render_params.h"
 #endif

-#if BUILDFLAG(ENABLE_PRINTING)
-#include "chrome/browser/printing/print_view_manager_basic.h"
-#include "components/printing/common/print_messages.h"
-#endif
-
 #include "atom/common/node_includes.h"

+namespace {
+
+struct PrintSettings {
+  bool silent;
+  bool print_background;
+  base::string16 device_name;
+};
+}  // namespace
+
 namespace mate {

-#if BUILDFLAG(ENABLE_PRINTING)
+template <>
+struct Converter<PrintSettings> {
+  static bool FromV8(v8::Isolate* isolate,
+                     v8::Local<v8::Value> val,
+                     PrintSettings* out) {
+    mate::Dictionary dict;
+    if (!ConvertFromV8(isolate, val, &dict))
+      return false;
+    dict.Get("silent", &(out->silent));
+    dict.Get("printBackground", &(out->print_background));
+    dict.Get("deviceName", &(out->device_name));
+    return true;
+  }
+};
+
 template <>
 struct Converter<printing::PrinterBasicInfo> {
  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
@@ -124,7 +142,6 @@ struct Converter<printing::PrinterBasicInfo> {
    return dict.GetHandle();
  }
 };
-#endif

 template <>
 struct Converter<WindowOpenDisposition> {
@@ -241,7 +258,7 @@ namespace api {
 namespace {

 content::ServiceWorkerContext* GetServiceWorkerContext(
-    content::WebContents* web_contents) {
+    const content::WebContents* web_contents) {
  auto* context = web_contents->GetBrowserContext();
  auto* site_instance = web_contents->GetSiteInstance();
  if (!context || !site_instance)
@@ -256,12 +273,12 @@ content::ServiceWorkerContext* GetServiceWorkerContext(
 }

 // Called when CapturePage is done.
-void OnCapturePageDone(scoped_refptr<util::Promise> promise,
+void OnCapturePageDone(const base::Callback<void(const gfx::Image&)>& callback,
                       const SkBitmap& bitmap) {
  // Hack to enable transparency in captured image
  // TODO(nitsakh) Remove hack once fixed in chromium
  const_cast<SkBitmap&>(bitmap).setAlphaType(kPremul_SkAlphaType);
-  promise->Resolve(gfx::Image::CreateFrom1xBitmap(bitmap));
+  callback.Run(gfx::Image::CreateFrom1xBitmap(bitmap));
 }

 }  // namespace
@@ -288,24 +305,21 @@ struct WebContents::FrameDispatchHelper {
 };

 WebContents::WebContents(v8::Isolate* isolate,
-                         content::WebContents* web_contents)
-    : content::WebContentsObserver(web_contents), type_(REMOTE) {
-  web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent(),
-                                     false);
-  Init(isolate);
-  AttachAsUserData(web_contents);
-  InitZoomController(web_contents, mate::Dictionary::CreateEmpty(isolate));
-}
-
-WebContents::WebContents(v8::Isolate* isolate,
-                         std::unique_ptr<content::WebContents> web_contents,
+                         content::WebContents* web_contents,
                         Type type)
-    : content::WebContentsObserver(web_contents.get()), type_(type) {
-  DCHECK(type != REMOTE) << "Can't take ownership of a remote WebContents";
-  auto session = Session::CreateFrom(isolate, GetBrowserContext());
-  session_.Reset(isolate, session.ToV8());
-  InitWithSessionAndOptions(isolate, std::move(web_contents), session,
-                            mate::Dictionary::CreateEmpty(isolate));
+    : content::WebContentsObserver(web_contents), type_(type) {
+  const mate::Dictionary options = mate::Dictionary::CreateEmpty(isolate);
+  if (type == REMOTE) {
+    web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent(),
+                                       false);
+    Init(isolate);
+    AttachAsUserData(web_contents);
+    InitZoomController(web_contents, options);
+  } else {
+    auto session = Session::CreateFrom(isolate, GetBrowserContext());
+    session_.Reset(isolate, session.ToV8());
+    InitWithSessionAndOptions(isolate, web_contents, session, options);
+  }
 }

 WebContents::WebContents(v8::Isolate* isolate,
@@ -391,7 +405,7 @@ WebContents::WebContents(v8::Isolate* isolate,
    web_contents = content::WebContents::Create(params);
  }

-  InitWithSessionAndOptions(isolate, std::move(web_contents), session, options);
+  InitWithSessionAndOptions(isolate, web_contents.release(), session, options);
 }

 void WebContents::InitZoomController(content::WebContents* web_contents,
@@ -403,47 +417,43 @@ void WebContents::InitZoomController(content::WebContents* web_contents,
    zoom_controller_->SetDefaultZoomFactor(zoom_factor);
 }

-void WebContents::InitWithSessionAndOptions(
-    v8::Isolate* isolate,
-    std::unique_ptr<content::WebContents> owned_web_contents,
-    mate::Handle<api::Session> session,
-    const mate::Dictionary& options) {
-  Observe(owned_web_contents.get());
-  // TODO(zcbenz): Make InitWithWebContents take unique_ptr.
-  // At the time of writing we are going through a refactoring and I don't want
-  // to make other people's work harder.
-  InitWithWebContents(owned_web_contents.release(), session->browser_context(),
-                      IsGuest());
+void WebContents::InitWithSessionAndOptions(v8::Isolate* isolate,
+                                            content::WebContents* web_contents,
+                                            mate::Handle<api::Session> session,
+                                            const mate::Dictionary& options) {
+  Observe(web_contents);
+  InitWithWebContents(web_contents, session->browser_context(), IsGuest());

  managed_web_contents()->GetView()->SetDelegate(this);

-  auto* prefs = web_contents()->GetMutableRendererPrefs();
+  auto* prefs = web_contents->GetMutableRendererPrefs();
  prefs->accept_languages = g_browser_process->GetApplicationLocale();

 #if defined(OS_LINUX) || defined(OS_WIN)
  // Update font settings.
-  static const base::NoDestructor<gfx::FontRenderParams> params(
-      gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
-  prefs->should_antialias_text = params->antialiasing;
-  prefs->use_subpixel_positioning = params->subpixel_positioning;
-  prefs->hinting = params->hinting;
-  prefs->use_autohinter = params->autohinter;
-  prefs->use_bitmaps = params->use_bitmaps;
-  prefs->subpixel_rendering = params->subpixel_rendering;
+  CR_DEFINE_STATIC_LOCAL(
+      const gfx::FontRenderParams, params,
+      (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)));
+  prefs->should_antialias_text = params.antialiasing;
+  prefs->use_subpixel_positioning = params.subpixel_positioning;
+  prefs->hinting = params.hinting;
+  prefs->use_autohinter = params.autohinter;
+  prefs->use_bitmaps = params.use_bitmaps;
+  prefs->subpixel_rendering = params.subpixel_rendering;
 #endif

  // Save the preferences in C++.
-  new WebContentsPreferences(web_contents(), options);
+  new WebContentsPreferences(web_contents, options);

  // Initialize permission helper.
-  WebContentsPermissionHelper::CreateForWebContents(web_contents());
+  WebContentsPermissionHelper::CreateForWebContents(web_contents);
  // Initialize security state client.
-  SecurityStateTabHelper::CreateForWebContents(web_contents());
+  SecurityStateTabHelper::CreateForWebContents(web_contents);
  // Initialize zoom controller.
-  InitZoomController(web_contents(), options);
+  InitZoomController(web_contents, options);

-  web_contents()->SetUserAgentOverride(GetBrowserContext()->GetUserAgent(),
-                                       false);
+  web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent(),
+                                     false);

  if (IsGuest()) {
    NativeWindow* owner_window = nullptr;
@@ -459,7 +469,7 @@ void WebContents::InitWithSessionAndOptions(
  }

  Init(isolate);
-  AttachAsUserData(web_contents());
+  AttachAsUserData(web_contents);
 }

 WebContents::~WebContents() {
@@ -470,25 +480,14 @@ WebContents::~WebContents() {
    RenderViewDeleted(web_contents()->GetRenderViewHost());

    if (type_ == WEB_VIEW) {
-      DCHECK(!web_contents()->GetOuterWebContents())
-          << "Should never manually destroy an attached webview";
-      // For webview simply destroy the WebContents immediately.
-      DestroyWebContents(false /* async */);
-    } 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_)
-        observer.OnCloseContents();
-      // BrowserWindow destroys WebContents asynchronously, manually emit the
-      // destroyed event here.
-      WebContentsDestroyed();
-    } else if (Browser::Get()->is_shutting_down()) {
-      // Destroy WebContents directly when app is shutting down.
      DestroyWebContents(false /* async */);
    } else {
-      // Destroy WebContents asynchronously unless app is shutting down,
-      // because destroy() might be called inside WebContents's event handler.
-      DestroyWebContents(true /* async */);
+      if (type_ == BROWSER_WINDOW && owner_window()) {
+        for (ExtendedWebContentsObserver& observer : observers_)
+          observer.OnCloseContents();
+      } else {
+        DestroyWebContents(true /* async */);
+      }
      // The WebContentsDestroyed will not be called automatically because we
      // destroy the webContents in the next tick. So we have to manually
      // call it here to make sure "destroyed" event is emitted.
@@ -532,10 +531,10 @@ void WebContents::WebContentsCreated(content::WebContents* source_contents,
                                     const std::string& frame_name,
                                     const GURL& target_url,
                                     content::WebContents* new_contents) {
-  ChildWebContentsTracker::CreateForWebContents(new_contents);
-  auto* tracker = ChildWebContentsTracker::FromWebContents(new_contents);
-  tracker->url = target_url;
-  tracker->frame_name = frame_name;
+  v8::Locker locker(isolate());
+  v8::HandleScope handle_scope(isolate());
+  auto api_web_contents = CreateFrom(isolate(), new_contents, BROWSER_WINDOW);
+  Emit("-web-contents-created", api_web_contents, target_url, frame_name);
 }

 void WebContents::AddNewContents(
@@ -545,17 +544,13 @@ void WebContents::AddNewContents(
    const gfx::Rect& initial_rect,
    bool user_gesture,
    bool* was_blocked) {
-  auto* tracker = ChildWebContentsTracker::FromWebContents(new_contents.get());
-  DCHECK(tracker);
-
+  new ChildWebContentsTracker(new_contents.get());
  v8::Locker locker(isolate());
  v8::HandleScope handle_scope(isolate());
-  auto api_web_contents =
-      CreateAndTake(isolate(), std::move(new_contents), BROWSER_WINDOW);
+  auto api_web_contents = CreateFrom(isolate(), new_contents.release());
  if (Emit("-add-new-contents", api_web_contents, disposition, user_gesture,
           initial_rect.x(), initial_rect.y(), initial_rect.width(),
-           initial_rect.height(), tracker->url, tracker->frame_name)) {
-    // TODO(zcbenz): Can we make this sync?
+           initial_rect.height())) {
    api_web_contents->DestroyWebContents(true /* async */);
  }
 }
@@ -617,15 +612,15 @@ void WebContents::UpdateTargetURL(content::WebContents* source,
  Emit("update-target-url", url);
 }

-bool WebContents::HandleKeyboardEvent(
+void WebContents::HandleKeyboardEvent(
    content::WebContents* source,
    const content::NativeWebKeyboardEvent& event) {
  if (type_ == WEB_VIEW && embedder_) {
    // Send the unhandled keyboard events back to the embedder.
-    return embedder_->HandleKeyboardEvent(source, event);
+    embedder_->HandleKeyboardEvent(source, event);
  } else {
    // Go to the default keyboard handling.
-    return CommonWebContentsDelegate::HandleKeyboardEvent(source, event);
+    CommonWebContentsDelegate::HandleKeyboardEvent(source, event);
  }
 }

@@ -768,8 +763,7 @@ void WebContents::OnAudioStateChanged(bool audible) {
  Emit("-audio-state-changed", audible);
 }

-void WebContents::BeforeUnloadFired(bool proceed,
-                                    const base::TimeTicks& proceed_time) {
+void WebContents::BeforeUnloadFired(const base::TimeTicks& proceed_time) {
  // Do nothing, we override this method just to avoid compilation error since
  // there are two virtual functions named BeforeUnloadFired.
 }
@@ -782,29 +776,8 @@ void WebContents::RenderViewCreated(content::RenderViewHost* render_view_host) {
    impl->disable_hidden_ = !background_throttling_;
 }

-void WebContents::RenderViewHostChanged(content::RenderViewHost* old_host,
-                                        content::RenderViewHost* new_host) {
-  currently_committed_process_id_ = new_host->GetProcess()->GetID();
-}
-
 void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) {
-  // This event is necessary for tracking any states with respect to
-  // intermediate render view hosts aka speculative render view hosts. Currently
-  // used by object-registry.js to ref count remote objects.
  Emit("render-view-deleted", render_view_host->GetProcess()->GetID());
-
-  if (-1 == currently_committed_process_id_ ||
-      render_view_host->GetProcess()->GetID() ==
-          currently_committed_process_id_) {
-    currently_committed_process_id_ = -1;
-
-    // When the RVH that has been deleted is the current RVH it means that the
-    // the web contents are being closed. This is communicated by this event.
-    // Currently tracked by guest-window-manager.js to destroy the
-    // BrowserWindow.
-    Emit("current-render-view-deleted",
-         render_view_host->GetProcess()->GetID());
-  }
 }

 void WebContents::RenderProcessGone(base::TerminationStatus status) {
@@ -1001,8 +974,8 @@ void WebContents::DevToolsFocused() {
 void WebContents::DevToolsOpened() {
  v8::Locker locker(isolate());
  v8::HandleScope handle_scope(isolate());
-  auto handle =
-      FromOrCreate(isolate(), managed_web_contents()->GetDevToolsWebContents());
+  auto handle = WebContents::CreateFrom(
+      isolate(), managed_web_contents()->GetDevToolsWebContents());
  devtools_web_contents_.Reset(isolate(), handle.ToV8());

  // Set inspected tabID.
@@ -1053,7 +1026,7 @@ void WebContents::ShowAutofillPopup(content::RenderFrameHost* frame_host,
 bool WebContents::OnMessageReceived(const IPC::Message& message) {
  bool handled = true;
  IPC_BEGIN_MESSAGE_MAP(WebContents, message)
-    IPC_MESSAGE_HANDLER_CODE(WidgetHostMsg_SetCursor, OnCursorChange,
+    IPC_MESSAGE_HANDLER_CODE(ViewHostMsg_SetCursor, OnCursorChange,
                             handled = false)
    IPC_MESSAGE_UNHANDLED(handled = false)
  IPC_END_MESSAGE_MAP()
@@ -1126,37 +1099,6 @@ void WebContents::NavigationEntryCommitted(
       details.is_same_document, details.did_replace_entry);
 }

-void WebContents::SetBackgroundThrottling(bool allowed) {
-  background_throttling_ = allowed;
-
-  auto* contents = web_contents();
-  if (!contents) {
-    return;
-  }
-
-  const auto* render_view_host = contents->GetRenderViewHost();
-  if (!render_view_host) {
-    return;
-  }
-
-  const auto* render_process_host = render_view_host->GetProcess();
-  if (!render_process_host) {
-    return;
-  }
-
-  auto* render_widget_host_impl = content::RenderWidgetHostImpl::FromID(
-      render_process_host->GetID(), render_view_host->GetRoutingID());
-  if (!render_widget_host_impl) {
-    return;
-  }
-
-  render_widget_host_impl->disable_hidden_ = !background_throttling_;
-
-  if (render_widget_host_impl->is_hidden()) {
-    render_widget_host_impl->WasShown(false);
-  }
-}
-
 int WebContents::GetProcessID() const {
  return web_contents()->GetMainFrame()->GetProcess()->GetID();
 }
@@ -1188,9 +1130,8 @@ void WebContents::LoadURL(const GURL& url, const mate::Dictionary& options) {
  if (!options.Get("httpReferrer", &params.referrer)) {
    GURL http_referrer;
    if (options.Get("httpReferrer", &http_referrer))
-      params.referrer =
-          content::Referrer(http_referrer.GetAsReferrer(),
-                            network::mojom::ReferrerPolicy::kDefault);
+      params.referrer = content::Referrer(http_referrer.GetAsReferrer(),
+                                          blink::kWebReferrerPolicyDefault);
  }

  std::string user_agent;
@@ -1330,16 +1271,14 @@ void WebContents::OpenDevTools(mate::Arguments* args) {
  if (type_ == WEB_VIEW || !owner_window()) {
    state = "detach";
  }
-  bool activate = true;
  if (args && args->Length() == 1) {
    mate::Dictionary options;
    if (args->GetNext(&options)) {
      options.Get("mode", &state);
-      options.Get("activate", &activate);
    }
  }
  managed_web_contents()->SetDockState(state);
-  managed_web_contents()->ShowDevTools(activate);
+  managed_web_contents()->ShowDevTools();
 }

 void WebContents::CloseDevTools() {
@@ -1374,8 +1313,8 @@ void WebContents::EnableDeviceEmulation(
        frame_host ? frame_host->GetView()->GetRenderWidgetHost() : nullptr;
    if (!widget_host)
      return;
-    widget_host->Send(new WidgetMsg_EnableDeviceEmulation(
-        widget_host->GetRoutingID(), params));
+    widget_host->Send(
+        new ViewMsg_EnableDeviceEmulation(widget_host->GetRoutingID(), params));
  }
 }

@@ -1390,7 +1329,7 @@ void WebContents::DisableDeviceEmulation() {
    if (!widget_host)
      return;
    widget_host->Send(
-        new WidgetMsg_DisableDeviceEmulation(widget_host->GetRoutingID()));
+        new ViewMsg_DisableDeviceEmulation(widget_host->GetRoutingID()));
  }
 }

@@ -1483,58 +1422,40 @@ bool WebContents::IsCurrentlyAudible() {
  return web_contents()->IsCurrentlyAudible();
 }

-#if BUILDFLAG(ENABLE_PRINTING)
 void WebContents::Print(mate::Arguments* args) {
-  bool silent, print_background = false;
-  base::string16 device_name;
-  mate::Dictionary options = mate::Dictionary::CreateEmpty(args->isolate());
-  base::DictionaryValue settings;
-  if (args->Length() >= 1 && !args->GetNext(&options)) {
-    args->ThrowError("Invalid print settings specified");
+  PrintSettings settings = {false, false, base::string16()};
+  if (args->Length() >= 1 && !args->GetNext(&settings)) {
+    args->ThrowError();
    return;
  }
-  printing::CompletionCallback callback;
-  if (args->Length() == 2 && !args->GetNext(&callback)) {
-    args->ThrowError("Invalid optional callback provided");
-    return;
-  }
-  options.Get("silent", &silent);
-  options.Get("printBackground", &print_background);
-  if (options.Get("deviceName", &device_name) && !device_name.empty()) {
-    settings.SetString(printing::kSettingDeviceName, device_name);
-  }
-  auto* print_view_manager =
+  auto* print_view_manager_basic_ptr =
      printing::PrintViewManagerBasic::FromWebContents(web_contents());
-  auto* focused_frame = web_contents()->GetFocusedFrame();
-  auto* rfh = focused_frame && focused_frame->HasSelection()
-                  ? focused_frame
-                  : web_contents()->GetMainFrame();
-  print_view_manager->PrintNow(
-      rfh,
-      std::make_unique<PrintMsg_PrintPages>(rfh->GetRoutingID(), silent,
-                                            print_background, settings),
-      std::move(callback));
+  if (args->Length() == 2) {
+    base::Callback<void(bool)> callback;
+    if (!args->GetNext(&callback)) {
+      args->ThrowError();
+      return;
+    }
+    print_view_manager_basic_ptr->SetCallback(callback);
+  }
+  print_view_manager_basic_ptr->PrintNow(
+      web_contents()->GetMainFrame(), settings.silent,
+      settings.print_background, settings.device_name);
 }

 std::vector<printing::PrinterBasicInfo> WebContents::GetPrinterList() {
  std::vector<printing::PrinterBasicInfo> printers;
  auto print_backend = printing::PrintBackend::CreateInstance(nullptr);
-  {
-    // TODO(deepak1556): Deprecate this api in favor of an
-    // async version and post a non blocing task call.
-    base::ThreadRestrictions::ScopedAllowIO allow_io;
-    print_backend->EnumeratePrinters(&printers);
-  }
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
+  print_backend->EnumeratePrinters(&printers);
  return printers;
 }

-void WebContents::PrintToPDF(
-    const base::DictionaryValue& settings,
-    const PrintPreviewMessageHandler::PrintToPDFCallback& callback) {
-  PrintPreviewMessageHandler::FromWebContents(web_contents())
-      ->PrintToPDF(settings, callback);
+void WebContents::PrintToPDF(const base::DictionaryValue& setting,
+                             const PrintToPDFCallback& callback) {
+  printing::PrintPreviewMessageHandler::FromWebContents(web_contents())
+      ->PrintToPDF(setting, callback);
 }
-#endif

 void WebContents::AddWorkSpace(mate::Arguments* args,
                               const base::FilePath& path) {
@@ -1599,22 +1520,17 @@ void WebContents::ReplaceMisspelling(const base::string16& word) {
 }

 uint32_t WebContents::FindInPage(mate::Arguments* args) {
+  uint32_t request_id = GetNextRequestId();
  base::string16 search_text;
+  blink::WebFindOptions options;
  if (!args->GetNext(&search_text) || search_text.empty()) {
    args->ThrowError("Must provide a non-empty search content");
    return 0;
  }

-  uint32_t request_id = GetNextRequestId();
-  mate::Dictionary dict;
-  auto options = blink::mojom::FindOptions::New();
-  if (args->GetNext(&dict)) {
-    dict.Get("forward", &options->forward);
-    dict.Get("matchCase", &options->match_case);
-    dict.Get("findNext", &options->find_next);
-  }
+  args->GetNext(&options);

-  web_contents()->Find(request_id, search_text, std::move(options));
+  web_contents()->Find(request_id, search_text, options);
  return request_id;
 }

@@ -1681,23 +1597,6 @@ bool WebContents::SendIPCMessageWithSender(bool internal,
  return false;
 }

-bool WebContents::SendIPCMessageToFrame(bool internal,
-                                        bool send_to_all,
-                                        int32_t frame_id,
-                                        const std::string& channel,
-                                        const base::ListValue& args) {
-  auto frames = web_contents()->GetAllFrames();
-  auto iter = std::find_if(frames.begin(), frames.end(), [frame_id](auto* f) {
-    return f->GetRoutingID() == frame_id;
-  });
-  if (iter == frames.end())
-    return false;
-  if (!(*iter)->IsRenderFrameLive())
-    return false;
-  return (*iter)->Send(new AtomFrameMsg_Message(
-      frame_id, internal, send_to_all, channel, args, 0 /* sender_id */));
-}
-
 void WebContents::SendInputEvent(v8::Isolate* isolate,
                                 v8::Local<v8::Value> input_event) {
  content::RenderWidgetHostView* view =
@@ -1794,24 +1693,28 @@ void WebContents::StartDrag(const mate::Dictionary& item,

  // Start dragging.
  if (!files.empty()) {
-    base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
+    base::MessageLoop::ScopedNestableTaskAllower allow;
    DragFileItems(files, icon->image(), web_contents()->GetNativeView());
  } else {
    args->ThrowError("Must specify either 'file' or 'files' option");
  }
 }

-v8::Local<v8::Promise> WebContents::CapturePage(mate::Arguments* args) {
+void WebContents::CapturePage(mate::Arguments* args) {
  gfx::Rect rect;
-  scoped_refptr<util::Promise> promise = new util::Promise(isolate());
+  base::Callback<void(const gfx::Image&)> callback;

-  // get rect arguments if they exist
-  args->GetNext(&rect);
+  if (!(args->Length() == 1 && args->GetNext(&callback)) &&
+      !(args->Length() == 2 && args->GetNext(&rect) &&
+        args->GetNext(&callback))) {
+    args->ThrowError();
+    return;
+  }

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

  // Capture full page if user doesn't specify a |rect|.
@@ -1830,8 +1733,7 @@ v8::Local<v8::Promise> WebContents::CapturePage(mate::Arguments* args) {
    bitmap_size = gfx::ScaleToCeiledSize(view_size, scale);

  view->CopyFromSurface(gfx::Rect(rect.origin(), view_size), bitmap_size,
-                        base::BindOnce(&OnCapturePageDone, promise));
-  return promise->GetHandle();
+                        base::BindOnce(&OnCapturePageDone, callback));
 }

 void WebContents::OnCursorChange(const content::WebCursor& cursor) {
@@ -1987,13 +1889,6 @@ v8::Local<v8::Value> WebContents::GetLastWebPreferences(
  return mate::ConvertToV8(isolate, *web_preferences->last_preference());
 }

-bool WebContents::IsRemoteModuleEnabled() const {
-  if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
-    return web_preferences->IsRemoteModuleEnabled();
-  }
-  return true;
-}
-
 v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() const {
  if (owner_window())
    return BrowserWindow::From(isolate(), owner_window());
@@ -2094,8 +1989,6 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
  prototype->SetClassName(mate::StringToV8(isolate, "WebContents"));
  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
      .MakeDestroyable()
-      .SetMethod("setBackgroundThrottling",
-                 &WebContents::SetBackgroundThrottling)
      .SetMethod("getProcessId", &WebContents::GetProcessID)
      .SetMethod("getOSProcessId", &WebContents::GetOSProcessID)
      .SetMethod("equal", &WebContents::Equal)
@@ -2143,14 +2036,12 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("isFocused", &WebContents::IsFocused)
      .SetMethod("tabTraverse", &WebContents::TabTraverse)
      .SetMethod("_send", &WebContents::SendIPCMessage)
-      .SetMethod("_sendToFrame", &WebContents::SendIPCMessageToFrame)
      .SetMethod("sendInputEvent", &WebContents::SendInputEvent)
      .SetMethod("beginFrameSubscription", &WebContents::BeginFrameSubscription)
      .SetMethod("endFrameSubscription", &WebContents::EndFrameSubscription)
      .SetMethod("startDrag", &WebContents::StartDrag)
      .SetMethod("isGuest", &WebContents::IsGuest)
      .SetMethod("attachToIframe", &WebContents::AttachToIframe)
-      .SetMethod("detachFromOuterFrame", &WebContents::DetachFromOuterFrame)
      .SetMethod("isOffscreen", &WebContents::IsOffScreen)
 #if BUILDFLAG(ENABLE_OSR)
      .SetMethod("startPainting", &WebContents::StartPainting)
@@ -2161,24 +2052,21 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
 #endif
      .SetMethod("invalidate", &WebContents::Invalidate)
      .SetMethod("setZoomLevel", &WebContents::SetZoomLevel)
-      .SetMethod("getZoomLevel", &WebContents::GetZoomLevel)
+      .SetMethod("_getZoomLevel", &WebContents::GetZoomLevel)
      .SetMethod("setZoomFactor", &WebContents::SetZoomFactor)
-      .SetMethod("getZoomFactor", &WebContents::GetZoomFactor)
+      .SetMethod("_getZoomFactor", &WebContents::GetZoomFactor)
      .SetMethod("getType", &WebContents::GetType)
      .SetMethod("_getPreloadPath", &WebContents::GetPreloadPath)
      .SetMethod("getWebPreferences", &WebContents::GetWebPreferences)
      .SetMethod("getLastWebPreferences", &WebContents::GetLastWebPreferences)
-      .SetMethod("_isRemoteModuleEnabled", &WebContents::IsRemoteModuleEnabled)
      .SetMethod("getOwnerBrowserWindow", &WebContents::GetOwnerBrowserWindow)
      .SetMethod("hasServiceWorker", &WebContents::HasServiceWorker)
      .SetMethod("unregisterServiceWorker",
                 &WebContents::UnregisterServiceWorker)
      .SetMethod("inspectServiceWorker", &WebContents::InspectServiceWorker)
-#if BUILDFLAG(ENABLE_PRINTING)
-      .SetMethod("_print", &WebContents::Print)
-      .SetMethod("_getPrinters", &WebContents::GetPrinterList)
+      .SetMethod("print", &WebContents::Print)
+      .SetMethod("getPrinters", &WebContents::GetPrinterList)
      .SetMethod("_printToPDF", &WebContents::PrintToPDF)
-#endif
      .SetMethod("addWorkSpace", &WebContents::AddWorkSpace)
      .SetMethod("removeWorkSpace", &WebContents::RemoveWorkSpace)
      .SetMethod("showDefinitionForSelection",
@@ -2209,7 +2097,7 @@ void WebContents::OnRendererMessage(content::RenderFrameHost* frame_host,
                                    const std::string& channel,
                                    const base::ListValue& args) {
  // webContents.emit(channel, new Event(), args...);
-  EmitWithSender(channel, frame_host, nullptr, args);
+  Emit(channel, args);
 }

 void WebContents::OnRendererMessageSync(content::RenderFrameHost* frame_host,
@@ -2236,40 +2124,32 @@ void WebContents::OnRendererMessageTo(content::RenderFrameHost* frame_host,
 }

 // static
-mate::Handle<WebContents> WebContents::Create(v8::Isolate* isolate,
-                                              const mate::Dictionary& options) {
-  return mate::CreateHandle(isolate, new WebContents(isolate, options));
-}
-
-// static
-mate::Handle<WebContents> WebContents::CreateAndTake(
-    v8::Isolate* isolate,
-    std::unique_ptr<content::WebContents> web_contents,
-    Type type) {
-  return mate::CreateHandle(
-      isolate, new WebContents(isolate, std::move(web_contents), type));
-}
-
-// static
-mate::Handle<WebContents> WebContents::From(
+mate::Handle<WebContents> WebContents::CreateFrom(
    v8::Isolate* isolate,
    content::WebContents* web_contents) {
+  // We have an existing WebContents object in JS.
  auto* existing = TrackableObject::FromWrappedClass(isolate, web_contents);
  if (existing)
    return mate::CreateHandle(isolate, static_cast<WebContents*>(existing));
-  else
-    return mate::Handle<WebContents>();
+
+  // Otherwise create a new WebContents wrapper object.
+  return mate::CreateHandle(isolate,
+                            new WebContents(isolate, web_contents, REMOTE));
+}
+
+mate::Handle<WebContents> WebContents::CreateFrom(
+    v8::Isolate* isolate,
+    content::WebContents* web_contents,
+    Type type) {
+  // Otherwise create a new WebContents wrapper object.
+  return mate::CreateHandle(isolate,
+                            new WebContents(isolate, web_contents, type));
 }

 // static
-mate::Handle<WebContents> WebContents::FromOrCreate(
-    v8::Isolate* isolate,
-    content::WebContents* web_contents) {
-  auto existing = From(isolate, web_contents);
-  if (!existing.IsEmpty())
-    return existing;
-  else
-    return mate::CreateHandle(isolate, new WebContents(isolate, web_contents));
+mate::Handle<WebContents> WebContents::Create(v8::Isolate* isolate,
+                                              const mate::Dictionary& options) {
+  return mate::CreateHandle(isolate, new WebContents(isolate, options));
 }

 }  // namespace api
@@ -2286,9 +2166,7 @@ void Initialize(v8::Local<v8::Object> exports,
                void* priv) {
  v8::Isolate* isolate = context->GetIsolate();
  mate::Dictionary dict(isolate, exports);
-  dict.Set("WebContents", WebContents::GetConstructor(isolate)
-                              ->GetFunction(context)
-                              .ToLocalChecked());
+  dict.Set("WebContents", WebContents::GetConstructor(isolate)->GetFunction());
  dict.SetMethod("create", &WebContents::Create);
  dict.SetMethod("fromId", &mate::TrackableObject<WebContents>::FromWeakMapID);
  dict.SetMethod("getAllWebContents",
--- a/atom/browser/api/atom_api_web_contents.h
+++ b/atom/browser/api/atom_api_web_contents.h
@@ -15,7 +15,6 @@
 #include "atom/browser/common_web_contents_delegate.h"
 #include "atom/browser/ui/autofill_popup.h"
 #include "base/observer_list.h"
-#include "base/observer_list_types.h"
 #include "content/common/cursors/webcursor.h"
 #include "content/public/browser/keyboard_event_processing_result.h"
 #include "content/public/browser/web_contents.h"
@@ -23,18 +22,17 @@
 #include "content/public/common/favicon_url.h"
 #include "electron/buildflags/buildflags.h"
 #include "native_mate/handle.h"
-#include "printing/buildflags/buildflags.h"
-#include "ui/gfx/image/image.h"
-
-#if BUILDFLAG(ENABLE_PRINTING)
-#include "atom/browser/printing/print_preview_message_handler.h"
 #include "printing/backend/print_backend.h"
-#endif
+#include "ui/gfx/image/image.h"

 namespace blink {
 struct WebDeviceEmulationParams;
 }

+namespace brightray {
+class InspectableWebContents;
+}
+
 namespace mate {
 class Arguments;
 class Dictionary;
@@ -48,26 +46,22 @@ namespace atom {

 class AtomBrowserContext;
 class AtomJavaScriptDialogManager;
-class InspectableWebContents;
 class WebContentsZoomController;
 class WebViewGuestDelegate;
 class FrameSubscriber;

 #if BUILDFLAG(ENABLE_OSR)
-class OffScreenRenderWidgetHostView;
+class OffScreenWebContentsView;
 #endif

 namespace api {

 // Certain events are only in WebContentsDelegate, provide our own Observer to
 // dispatch those events.
-class ExtendedWebContentsObserver : public base::CheckedObserver {
+class ExtendedWebContentsObserver {
 public:
  virtual void OnCloseContents() {}
  virtual void OnRendererResponsive() {}
-
- protected:
-  ~ExtendedWebContentsObserver() override {}
 };

 // Wrapper around the content::WebContents.
@@ -84,49 +78,29 @@ class WebContents : public mate::TrackableObject<WebContents>,
    OFF_SCREEN,       // Used for offscreen rendering
  };

-  // Create a new WebContents and return the V8 wrapper of it.
-  static mate::Handle<WebContents> Create(v8::Isolate* isolate,
-                                          const mate::Dictionary& options);
+  // For node.js callback function type: function(error, buffer)
+  using PrintToPDFCallback =
+      base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>)>;

-  // Create a new V8 wrapper for an existing |web_content|.
-  //
-  // The lifetime of |web_contents| will be managed by this class.
-  static mate::Handle<WebContents> CreateAndTake(
-      v8::Isolate* isolate,
-      std::unique_ptr<content::WebContents> web_contents,
-      Type type);
-
-  // Get the V8 wrapper of |web_content|, return empty handle if not wrapped.
-  static mate::Handle<WebContents> From(v8::Isolate* isolate,
-                                        content::WebContents* web_content);
-
-  // Get the V8 wrapper of the |web_contents|, or create one if not existed.
-  //
-  // The lifetime of |web_contents| is NOT managed by this class, and the type
-  // of this wrapper is always REMOTE.
-  static mate::Handle<WebContents> FromOrCreate(
+  // Create from an existing WebContents.
+  static mate::Handle<WebContents> CreateFrom(
      v8::Isolate* isolate,
      content::WebContents* web_contents);
+  static mate::Handle<WebContents> CreateFrom(
+      v8::Isolate* isolate,
+      content::WebContents* web_contents,
+      Type type);
+
+  // Create a new WebContents.
+  static mate::Handle<WebContents> Create(v8::Isolate* isolate,
+                                          const mate::Dictionary& options);

  static void BuildPrototype(v8::Isolate* isolate,
                             v8::Local<v8::FunctionTemplate> prototype);

-  // Destroy the managed content::WebContents instance.
-  //
-  // Note: The |async| should only be |true| when users are expecting to use the
-  // webContents immediately after the call. Always pass |false| if you are not
-  // sure.
-  // See https://github.com/electron/electron/issues/8930.
-  //
-  // Note: When destroying a webContents member inside a destructor, the |async|
-  // should always be |false|, otherwise the destroy task might be delayed after
-  // normal shutdown procedure, resulting in an assertion.
-  // The normal pattern for calling this method in destructor is:
-  // api_web_contents_->DestroyWebContents(!Browser::Get()->is_shutting_down())
-  // See https://github.com/electron/electron/issues/15133.
+  // Notifies to destroy any guest web contents before destroying self.
  void DestroyWebContents(bool async);

-  void SetBackgroundThrottling(bool allowed);
  int GetProcessID() const;
  base::ProcessId GetOSProcessID() const;
  Type GetType() const;
@@ -167,18 +141,15 @@ class WebContents : public mate::TrackableObject<WebContents>,
  void SetAudioMuted(bool muted);
  bool IsAudioMuted();
  bool IsCurrentlyAudible();
+  void Print(mate::Arguments* args);
+  std::vector<printing::PrinterBasicInfo> GetPrinterList();
  void SetEmbedder(const WebContents* embedder);
  void SetDevToolsWebContents(const WebContents* devtools);
  v8::Local<v8::Value> GetNativeView() const;

-#if BUILDFLAG(ENABLE_PRINTING)
-  void Print(mate::Arguments* args);
-  std::vector<printing::PrinterBasicInfo> GetPrinterList();
  // Print current page as PDF.
-  void PrintToPDF(
-      const base::DictionaryValue& settings,
-      const PrintPreviewMessageHandler::PrintToPDFCallback& callback);
-#endif
+  void PrintToPDF(const base::DictionaryValue& setting,
+                  const PrintToPDFCallback& callback);

  // DevTools workspace api.
  void AddWorkSpace(mate::Arguments* args, const base::FilePath& path);
@@ -218,12 +189,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
                                const base::ListValue& args,
                                int32_t sender_id = 0);

-  bool SendIPCMessageToFrame(bool internal,
-                             bool send_to_all,
-                             int32_t frame_id,
-                             const std::string& channel,
-                             const base::ListValue& args);
-
  // Send WebInputEvent to the page.
  void SendInputEvent(v8::Isolate* isolate, v8::Local<v8::Value> input_event);

@@ -236,13 +201,12 @@ class WebContents : public mate::TrackableObject<WebContents>,

  // Captures the page with |rect|, |callback| would be called when capturing is
  // done.
-  v8::Local<v8::Promise> CapturePage(mate::Arguments* args);
+  void CapturePage(mate::Arguments* args);

  // Methods for creating <webview>.
  bool IsGuest() const;
  void AttachToIframe(content::WebContents* embedder_web_contents,
                      int embedder_frame_id);
-  void DetachFromOuterFrame();

  // Methods for offscreen rendering
  bool IsOffScreen() const;
@@ -284,8 +248,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate) const;
  v8::Local<v8::Value> GetLastWebPreferences(v8::Isolate* isolate) const;

-  bool IsRemoteModuleEnabled() const;
-
  // Returns the owner window.
  v8::Local<v8::Value> GetOwnerBrowserWindow() const;

@@ -309,30 +271,23 @@ class WebContents : public mate::TrackableObject<WebContents>,
    observers_.AddObserver(obs);
  }
  void RemoveObserver(ExtendedWebContentsObserver* obs) {
-    // Trying to remove from an empty collection leads to an access violation
-    if (observers_.might_have_observers())
-      observers_.RemoveObserver(obs);
+    observers_.RemoveObserver(obs);
  }

  bool EmitNavigationEvent(const std::string& event,
                           content::NavigationHandle* navigation_handle);

 protected:
-  // Does not manage lifetime of |web_contents|.
-  WebContents(v8::Isolate* isolate, content::WebContents* web_contents);
-  // Takes over ownership of |web_contents|.
  WebContents(v8::Isolate* isolate,
-              std::unique_ptr<content::WebContents> web_contents,
+              content::WebContents* web_contents,
              Type type);
-  // Creates a new content::WebContents.
  WebContents(v8::Isolate* isolate, const mate::Dictionary& options);
  ~WebContents() override;

-  void InitWithSessionAndOptions(
-      v8::Isolate* isolate,
-      std::unique_ptr<content::WebContents> web_contents,
-      mate::Handle<class Session> session,
-      const mate::Dictionary& options);
+  void InitWithSessionAndOptions(v8::Isolate* isolate,
+                                 content::WebContents* web_contents,
+                                 mate::Handle<class Session> session,
+                                 const mate::Dictionary& options);

  // content::WebContentsDelegate:
  bool DidAddMessageToConsole(content::WebContents* source,
@@ -363,7 +318,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
  void CloseContents(content::WebContents* source) override;
  void ActivateContents(content::WebContents* contents) override;
  void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
-  bool HandleKeyboardEvent(
+  void HandleKeyboardEvent(
      content::WebContents* source,
      const content::NativeWebKeyboardEvent& event) override;
  content::KeyboardEventProcessingResult PreHandleKeyboardEvent(
@@ -407,11 +362,8 @@ class WebContents : public mate::TrackableObject<WebContents>,
  void OnAudioStateChanged(bool audible) override;

  // content::WebContentsObserver:
-  void BeforeUnloadFired(bool proceed,
-                         const base::TimeTicks& proceed_time) override;
+  void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
  void RenderViewCreated(content::RenderViewHost*) override;
-  void RenderViewHostChanged(content::RenderViewHost* old_host,
-                             content::RenderViewHost* new_host) override;
  void RenderViewDeleted(content::RenderViewHost*) override;
  void RenderProcessGone(base::TerminationStatus status) override;
  void DocumentLoadedInFrame(
@@ -449,10 +401,10 @@ class WebContents : public mate::TrackableObject<WebContents>,
      content::WebContentsObserver::MediaStoppedReason reason) override;
  void DidChangeThemeColor(SkColor theme_color) override;

-  // InspectableWebContentsDelegate:
+  // brightray::InspectableWebContentsDelegate:
  void DevToolsReloadPage() override;

-  // InspectableWebContentsViewDelegate:
+  // brightray::InspectableWebContentsViewDelegate:
  void DevToolsFocused() override;
  void DevToolsOpened() override;
  void DevToolsClosed() override;
@@ -471,8 +423,9 @@ class WebContents : public mate::TrackableObject<WebContents>,
  uint32_t GetNextRequestId() { return ++request_id_; }

 #if BUILDFLAG(ENABLE_OSR)
-  OffScreenWebContentsView* GetOffScreenWebContentsView() const override;
-  OffScreenRenderWidgetHostView* GetOffScreenRenderWidgetHostView() const;
+  OffScreenWebContentsView* GetOffScreenWebContentsView() const;
+  OffScreenRenderWidgetHostView* GetOffScreenRenderWidgetHostView()
+      const override;
 #endif

  // Called when we receive a CursorChange message from chromium.
@@ -517,6 +470,7 @@ class WebContents : public mate::TrackableObject<WebContents>,

  std::unique_ptr<AtomJavaScriptDialogManager> dialog_manager_;
  std::unique_ptr<WebViewGuestDelegate> guest_delegate_;
+
  std::unique_ptr<FrameSubscriber> frame_subscriber_;

  // The host webcontents that may contain this webcontents.
@@ -540,10 +494,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
  // Observers of this WebContents.
  base::ObserverList<ExtendedWebContentsObserver> observers_;

-  // The ID of the process of the currently committed RenderViewHost.
-  // -1 means no speculative RVH has been committed yet.
-  int currently_committed_process_id_ = -1;
-
  DISALLOW_COPY_AND_ASSIGN(WebContents);
 };

--- a/atom/browser/api/atom_api_web_contents_mac.mm
+++ b/atom/browser/api/atom_api_web_contents_mac.mm
@@ -17,7 +17,7 @@ bool WebContents::IsFocused() const {
    return false;

  if (GetType() != BACKGROUND_PAGE) {
-    auto window = [web_contents()->GetNativeView().GetNativeNSView() window];
+    auto window = [web_contents()->GetNativeView() window];
    // On Mac the render widget host view does not lose focus when the window
    // loses focus so check if the top level window is the key window.
    if (window && ![window isKeyWindow])
--- a/atom/browser/api/atom_api_web_contents_impl.cc
+++ b/atom/browser/api/atom_api_web_contents_impl.cc
@@ -4,12 +4,9 @@

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

-#include "content/browser/web_contents/web_contents_impl.h"
-
-#if BUILDFLAG(ENABLE_OSR)
 #include "atom/browser/osr/osr_render_widget_host_view.h"
 #include "atom/browser/osr/osr_web_contents_view.h"
-#endif
+#include "content/browser/web_contents/web_contents_impl.h"

 // Including both web_contents_impl.h and node.h would introduce a error, we
 // have to isolate the usage of WebContentsImpl into a clean file to fix it:
@@ -19,13 +16,6 @@ namespace atom {

 namespace api {

-void WebContents::DetachFromOuterFrame() {
-  // See detach_webview_frame.patch on how to detach.
-  auto* impl = static_cast<content::WebContentsImpl*>(web_contents());
-  impl->GetRenderManagerForTesting()->RemoveOuterDelegateFrame();
-}
-
-#if BUILDFLAG(ENABLE_OSR)
 OffScreenWebContentsView* WebContents::GetOffScreenWebContentsView() const {
  if (IsOffScreen()) {
    const auto* impl =
@@ -45,7 +35,6 @@ OffScreenRenderWidgetHostView* WebContents::GetOffScreenRenderWidgetHostView()
    return nullptr;
  }
 }
-#endif

 }  // namespace api

--- a/atom/browser/api/atom_api_web_contents_view.cc
+++ b/atom/browser/api/atom_api_web_contents_view.cc
@@ -5,9 +5,8 @@
 #include "atom/browser/api/atom_api_web_contents_view.h"

 #include "atom/browser/api/atom_api_web_contents.h"
-#include "atom/browser/browser.h"
-#include "atom/browser/ui/inspectable_web_contents_view.h"
 #include "atom/common/api/constructor.h"
+#include "brightray/browser/inspectable_web_contents_view.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "native_mate/dictionary.h"

@@ -36,13 +35,15 @@ class WebContentsViewRelay

 }  // namespace

+DEFINE_WEB_CONTENTS_USER_DATA_KEY(WebContentsViewRelay);
+
 namespace atom {

 namespace api {

 WebContentsView::WebContentsView(v8::Isolate* isolate,
                                 mate::Handle<WebContents> web_contents,
-                                 InspectableWebContents* iwc)
+                                 brightray::InspectableWebContents* iwc)
 #if defined(OS_MACOSX)
    : View(new DelayedNativeViewHost(iwc->GetView()->GetNativeView())),
 #else
@@ -63,11 +64,8 @@ WebContentsView::WebContentsView(v8::Isolate* isolate,
 }

 WebContentsView::~WebContentsView() {
-  if (api_web_contents_) {  // destroy() is called
-    // Destroy WebContents asynchronously unless app is shutting down,
-    // because destroy() might be called inside WebContents's event handler.
-    api_web_contents_->DestroyWebContents(!Browser::Get()->is_shutting_down());
-  }
+  if (api_web_contents_)
+    api_web_contents_->DestroyWebContents(false /* async */);
 }

 void WebContentsView::WebContentsDestroyed() {
--- a/atom/browser/api/atom_api_web_contents_view.h
+++ b/atom/browser/api/atom_api_web_contents_view.h
@@ -9,9 +9,11 @@
 #include "content/public/browser/web_contents_observer.h"
 #include "native_mate/handle.h"

-namespace atom {
-
+namespace brightray {
 class InspectableWebContents;
+}
+
+namespace atom {

 namespace api {

@@ -28,7 +30,7 @@ class WebContentsView : public View, public content::WebContentsObserver {
 protected:
  WebContentsView(v8::Isolate* isolate,
                  mate::Handle<WebContents> web_contents,
-                  InspectableWebContents* iwc);
+                  brightray::InspectableWebContents* iwc);
  ~WebContentsView() override;

  // content::WebContentsObserver:
--- a/atom/browser/api/atom_api_web_request.cc
+++ b/atom/browser/api/atom_api_web_request.cc
@@ -12,8 +12,6 @@
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/net_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
@@ -31,7 +29,7 @@ struct Converter<URLPattern> {
    if (!ConvertFromV8(isolate, val, &pattern))
      return false;
    *out = URLPattern(URLPattern::SCHEME_ALL);
-    return out->Parse(pattern) == URLPattern::ParseResult::kSuccess;
+    return out->Parse(pattern) == URLPattern::PARSE_SUCCESS;
  }
 };

@@ -99,8 +97,8 @@ void WebRequest::SetListener(Method method, Event type, mate::Arguments* args) {
      browser_context_->GetRequestContext());
  if (!url_request_context_getter)
    return;
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
      base::BindOnce(&CallNetworkDelegateMethod<Method, Event, Listener>,
                     base::RetainedRef(url_request_context_getter), method,
                     type, std::move(patterns), std::move(listener)));
--- a/atom/browser/api/event_emitter.cc
+++ b/atom/browser/api/event_emitter.cc
@@ -5,7 +5,6 @@
 #include "atom/browser/api/event_emitter.h"

 #include "atom/browser/api/event.h"
-#include "content/public/browser/render_frame_host.h"
 #include "native_mate/arguments.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
@@ -35,8 +34,7 @@ v8::Local<v8::Object> CreateEventObject(v8::Isolate* isolate) {
  }

  return v8::Local<v8::ObjectTemplate>::New(isolate, event_template)
-      ->NewInstance(isolate->GetCurrentContext())
-      .ToLocalChecked();
+      ->NewInstance();
 }

 }  // namespace
@@ -57,10 +55,7 @@ v8::Local<v8::Object> CreateJSEvent(v8::Isolate* isolate,
  } else {
    event = CreateEventObject(isolate);
  }
-  mate::Dictionary dict(isolate, event);
-  dict.Set("sender", object);
-  if (sender)
-    dict.Set("frameId", sender->GetRoutingID());
+  mate::Dictionary(isolate, event).Set("sender", object);
  return event;
 }

--- a/atom/browser/api/event_emitter.h
+++ b/atom/browser/api/event_emitter.h
@@ -8,7 +8,6 @@
 #include <vector>

 #include "atom/common/api/event_emitter_caller.h"
-#include "content/public/browser/browser_thread.h"
 #include "native_mate/wrappable.h"

 namespace content {
@@ -98,13 +97,11 @@ class EventEmitter : public Wrappable<T> {
  bool EmitWithEvent(const base::StringPiece& name,
                     v8::Local<v8::Object> event,
                     const Args&... args) {
-    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
    v8::Locker locker(isolate());
    v8::HandleScope handle_scope(isolate());
    EmitEvent(isolate(), GetWrapper(), name, event, args...);
    return event->Get(StringToV8(isolate(), "defaultPrevented"))
-        ->BooleanValue(isolate()->GetCurrentContext())
-        .ToChecked();
+        ->BooleanValue();
  }

  DISALLOW_COPY_AND_ASSIGN(EventEmitter);
--- a/atom/browser/api/frame_subscriber.cc
+++ b/atom/browser/api/frame_subscriber.cc
@@ -4,12 +4,13 @@

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

-#include <utility>
-
 #include "atom/common/native_mate_converters/gfx_converter.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/render_widget_host.h"
-#include "content/public/browser/render_widget_host_view.h"
+#include "components/viz/common/frame_sinks/copy_output_request.h"
+#include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
+#include "components/viz/service/surfaces/surface_manager.h"
+#include "content/browser/compositor/surface_utils.h"
+#include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/skbitmap_operations.h"

 #include "atom/common/node_includes.h"
@@ -18,8 +19,6 @@ namespace atom {

 namespace api {

-constexpr static int kMaxFrameRate = 30;
-
 FrameSubscriber::FrameSubscriber(v8::Isolate* isolate,
                                 content::WebContents* web_contents,
                                 const FrameCaptureCallback& callback,
@@ -28,123 +27,48 @@ FrameSubscriber::FrameSubscriber(v8::Isolate* isolate,
      isolate_(isolate),
      callback_(callback),
      only_dirty_(only_dirty),
-      weak_ptr_factory_(this) {
-  content::RenderViewHost* rvh = web_contents->GetRenderViewHost();
-  if (rvh)
-    AttachToHost(rvh->GetWidget());
-}
+      weak_ptr_factory_(this) {}

 FrameSubscriber::~FrameSubscriber() = default;

-void FrameSubscriber::AttachToHost(content::RenderWidgetHost* host) {
-  host_ = host;
+gfx::Rect FrameSubscriber::GetDamageRect() {
+  auto* view = web_contents()->GetRenderWidgetHostView();
+  if (view == nullptr)
+    return gfx::Rect();

-  // The view can be null if the renderer process has crashed.
-  // (https://crbug.com/847363)
-  if (!host_->GetView())
-    return;
+  auto* view_base = static_cast<content::RenderWidgetHostViewBase*>(view);
+  viz::SurfaceManager* surface_manager =
+      content::GetFrameSinkManager()->surface_manager();
+  viz::Surface* surface =
+      surface_manager->GetSurfaceForId(view_base->GetCurrentSurfaceId());
+  if (surface == nullptr)
+    return gfx::Rect();

-  // Create and configure the video capturer.
-  video_capturer_ = host_->GetView()->CreateVideoCapturer();
-  video_capturer_->SetResolutionConstraints(
-      host_->GetView()->GetViewBounds().size(),
-      host_->GetView()->GetViewBounds().size(), true);
-  video_capturer_->SetAutoThrottlingEnabled(false);
-  video_capturer_->SetMinSizeChangePeriod(base::TimeDelta());
-  video_capturer_->SetFormat(media::PIXEL_FORMAT_ARGB,
-                             gfx::ColorSpace::CreateREC709());
-  video_capturer_->SetMinCapturePeriod(base::TimeDelta::FromSeconds(1) /
-                                       kMaxFrameRate);
-  video_capturer_->Start(this);
-}
-
-void FrameSubscriber::DetachFromHost() {
-  if (!host_)
-    return;
-  video_capturer_.reset();
-  host_ = nullptr;
-}
-
-void FrameSubscriber::RenderViewCreated(content::RenderViewHost* host) {
-  if (!host_)
-    AttachToHost(host->GetWidget());
-}
-
-void FrameSubscriber::RenderViewDeleted(content::RenderViewHost* host) {
-  if (host->GetWidget() == host_) {
-    DetachFromHost();
+  if (surface->HasActiveFrame()) {
+    const viz::CompositorFrame& frame = surface->GetActiveFrame();
+    viz::RenderPass* root_pass = frame.render_pass_list.back().get();
+    gfx::Size frame_size = root_pass->output_rect.size();
+    gfx::Rect damage_rect =
+        gfx::ToEnclosingRect(gfx::RectF(root_pass->damage_rect));
+    damage_rect.Intersect(gfx::Rect(frame_size));
+    return gfx::ScaleToEnclosedRect(damage_rect,
+                                    1.0f / frame.device_scale_factor());
+  } else {
+    return gfx::Rect();
  }
 }

-void FrameSubscriber::RenderViewHostChanged(content::RenderViewHost* old_host,
-                                            content::RenderViewHost* new_host) {
-  if ((old_host && old_host->GetWidget() == host_) || (!old_host && !host_)) {
-    DetachFromHost();
-    AttachToHost(new_host->GetWidget());
-  }
+void FrameSubscriber::DidReceiveCompositorFrame() {
+  auto* view = web_contents()->GetRenderWidgetHostView();
+  if (view == nullptr)
+    return;
+
+  view->CopyFromSurface(
+      gfx::Rect(), view->GetViewBounds().size(),
+      base::BindOnce(&FrameSubscriber::Done, weak_ptr_factory_.GetWeakPtr(),
+                     GetDamageRect()));
 }

-void FrameSubscriber::OnFrameCaptured(
-    base::ReadOnlySharedMemoryRegion data,
-    ::media::mojom::VideoFrameInfoPtr info,
-    const gfx::Rect& update_rect,
-    const gfx::Rect& content_rect,
-    viz::mojom::FrameSinkVideoConsumerFrameCallbacksPtr callbacks) {
-  gfx::Size view_size = host_->GetView()->GetViewBounds().size();
-  if (view_size != content_rect.size()) {
-    video_capturer_->SetResolutionConstraints(view_size, view_size, true);
-    video_capturer_->RequestRefreshFrame();
-    return;
-  }
-
-  if (!data.IsValid()) {
-    callbacks->Done();
-    return;
-  }
-  base::ReadOnlySharedMemoryMapping mapping = data.Map();
-  if (!mapping.IsValid()) {
-    DLOG(ERROR) << "Shared memory mapping failed.";
-    return;
-  }
-  if (mapping.size() <
-      media::VideoFrame::AllocationSize(info->pixel_format, info->coded_size)) {
-    DLOG(ERROR) << "Shared memory size was less than expected.";
-    return;
-  }
-
-  // The SkBitmap's pixels will be marked as immutable, but the installPixels()
-  // API requires a non-const pointer. So, cast away the const.
-  void* const pixels = const_cast<void*>(mapping.memory());
-
-  // Call installPixels() with a |releaseProc| that: 1) notifies the capturer
-  // that this consumer has finished with the frame, and 2) releases the shared
-  // memory mapping.
-  struct FramePinner {
-    // Keeps the shared memory that backs |frame_| mapped.
-    base::ReadOnlySharedMemoryMapping mapping;
-    // Prevents FrameSinkVideoCapturer from recycling the shared memory that
-    // backs |frame_|.
-    viz::mojom::FrameSinkVideoConsumerFrameCallbacksPtr releaser;
-  };
-
-  SkBitmap bitmap;
-  bitmap.installPixels(
-      SkImageInfo::MakeN32(content_rect.width(), content_rect.height(),
-                           kPremul_SkAlphaType),
-      pixels,
-      media::VideoFrame::RowBytes(media::VideoFrame::kARGBPlane,
-                                  info->pixel_format, info->coded_size.width()),
-      [](void* addr, void* context) {
-        delete static_cast<FramePinner*>(context);
-      },
-      new FramePinner{std::move(mapping), std::move(callbacks)});
-  bitmap.setImmutable();
-
-  Done(content_rect, bitmap);
-}
-
-void FrameSubscriber::OnStopped() {}
-
 void FrameSubscriber::Done(const gfx::Rect& damage, const SkBitmap& frame) {
  if (frame.drawsNothing())
    return;
--- a/atom/browser/api/frame_subscriber.h
+++ b/atom/browser/api/frame_subscriber.h
@@ -5,13 +5,13 @@
 #ifndef ATOM_BROWSER_API_FRAME_SUBSCRIBER_H_
 #define ATOM_BROWSER_API_FRAME_SUBSCRIBER_H_

-#include <memory>
+#include "content/public/browser/web_contents.h"

 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
-#include "components/viz/host/client_frame_sink_video_capturer.h"
-#include "content/public/browser/web_contents.h"
+#include "components/viz/common/frame_sinks/copy_output_result.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "ui/gfx/image/image.h"
 #include "v8/include/v8.h"

 namespace atom {
@@ -20,8 +20,7 @@ namespace api {

 class WebContents;

-class FrameSubscriber : public content::WebContentsObserver,
-                        public viz::mojom::FrameSinkVideoConsumer {
+class FrameSubscriber : public content::WebContentsObserver {
 public:
  using FrameCaptureCallback =
      base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>)>;
@@ -33,32 +32,14 @@ class FrameSubscriber : public content::WebContentsObserver,
  ~FrameSubscriber() override;

 private:
-  void AttachToHost(content::RenderWidgetHost* host);
-  void DetachFromHost();
-
-  void RenderViewCreated(content::RenderViewHost* host) override;
-  void RenderViewDeleted(content::RenderViewHost* host) override;
-  void RenderViewHostChanged(content::RenderViewHost* old_host,
-                             content::RenderViewHost* new_host) override;
-
-  // viz::mojom::FrameSinkVideoConsumer implementation.
-  void OnFrameCaptured(
-      base::ReadOnlySharedMemoryRegion data,
-      ::media::mojom::VideoFrameInfoPtr info,
-      const gfx::Rect& update_rect,
-      const gfx::Rect& content_rect,
-      viz::mojom::FrameSinkVideoConsumerFrameCallbacksPtr callbacks) override;
-  void OnStopped() override;
-
+  gfx::Rect GetDamageRect();
+  void DidReceiveCompositorFrame() override;
  void Done(const gfx::Rect& damage, const SkBitmap& frame);

  v8::Isolate* isolate_;
  FrameCaptureCallback callback_;
  bool only_dirty_;

-  content::RenderWidgetHost* host_;
-  std::unique_ptr<viz::ClientFrameSinkVideoCapturer> video_capturer_;
-
  base::WeakPtrFactory<FrameSubscriber> weak_ptr_factory_;

  DISALLOW_COPY_AND_ASSIGN(FrameSubscriber);
--- a/atom/browser/api/gpu_info_enumerator.cc
+++ b/atom/browser/api/gpu_info_enumerator.cc
@@ -107,18 +107,6 @@ void GPUInfoEnumerator::EndOverlayCapability() {
  value_stack.pop();
 }

-void GPUInfoEnumerator::BeginDx12VulkanVersionInfo() {
-  value_stack.push(std::move(current));
-  current = std::make_unique<base::DictionaryValue>();
-}
-
-void GPUInfoEnumerator::EndDx12VulkanVersionInfo() {
-  auto& top_value = value_stack.top();
-  top_value->SetDictionary(kDx12VulkanVersionInfoKey, std::move(current));
-  current = std::move(top_value);
-  value_stack.pop();
-}
-
 std::unique_ptr<base::DictionaryValue> GPUInfoEnumerator::GetDictionary() {
  return std::move(current);
 }
--- a/atom/browser/api/gpu_info_enumerator.h
+++ b/atom/browser/api/gpu_info_enumerator.h
@@ -24,7 +24,6 @@ class GPUInfoEnumerator final : public gpu::GPUInfo::Enumerator {
      "videoEncodeAcceleratorSupportedProfile";
  const char* kAuxAttributesKey = "auxAttributes";
  const char* kOverlayCapabilityKey = "overlayCapability";
-  const char* kDx12VulkanVersionInfoKey = "dx12VulkanVersionInfo";

 public:
  GPUInfoEnumerator();
@@ -45,8 +44,6 @@ class GPUInfoEnumerator final : public gpu::GPUInfo::Enumerator {
  void EndAuxAttributes() override;
  void BeginOverlayCapability() override;
  void EndOverlayCapability() override;
-  void BeginDx12VulkanVersionInfo() override;
-  void EndDx12VulkanVersionInfo() override;
  std::unique_ptr<base::DictionaryValue> GetDictionary();

 private:
--- a/atom/browser/api/gpuinfo_manager.cc
+++ b/atom/browser/api/gpuinfo_manager.cc
@@ -26,12 +26,11 @@ GPUInfoManager::~GPUInfoManager() {

 // Based on
 // https://chromium.googlesource.com/chromium/src.git/+/69.0.3497.106/content/browser/gpu/gpu_data_manager_impl_private.cc#838
-bool GPUInfoManager::NeedsCompleteGpuInfoCollection() const {
-#if defined(OS_MACOSX)
-  return gpu_data_manager_->GetGPUInfo().gl_vendor.empty();
-#elif defined(OS_WIN)
-  return (gpu_data_manager_->GetGPUInfo().dx_diagnostics.values.empty() &&
-          gpu_data_manager_->GetGPUInfo().dx_diagnostics.children.empty());
+bool GPUInfoManager::NeedsCompleteGpuInfoCollection() {
+#if defined(OS_WIN)
+  const auto& gpu_info = gpu_data_manager_->GetGPUInfo();
+  return (gpu_info.dx_diagnostics.values.empty() &&
+          gpu_info.dx_diagnostics.children.empty());
 #else
  return false;
 #endif
--- a/atom/browser/api/gpuinfo_manager.h
+++ b/atom/browser/api/gpuinfo_manager.h
@@ -24,7 +24,7 @@ class GPUInfoManager : public content::GpuDataManagerObserver {

  GPUInfoManager();
  ~GPUInfoManager() override;
-  bool NeedsCompleteGpuInfoCollection() const;
+  bool NeedsCompleteGpuInfoCollection();
  void FetchCompleteInfo(scoped_refptr<util::Promise> promise);
  void FetchBasicInfo(scoped_refptr<util::Promise> promise);
  void OnGpuInfoUpdate() override;
--- a/atom/browser/api/stream_subscriber.cc
+++ b/atom/browser/api/stream_subscriber.cc
@@ -9,8 +9,6 @@
 #include "atom/browser/net/url_request_stream_job.h"
 #include "atom/common/api/event_emitter_caller.h"
 #include "atom/common/native_mate_converters/callback.h"
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"

 #include "atom/common/node_includes.h"

@@ -78,21 +76,23 @@ void StreamSubscriber::OnData(mate::Arguments* args) {

  // Pass the data to the URLJob in IO thread.
  std::vector<char> buffer(data, data + length);
-  base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                           base::Bind(&atom::URLRequestStreamJob::OnData,
-                                      url_job_, base::Passed(&buffer)));
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(&atom::URLRequestStreamJob::OnData, url_job_,
+                 base::Passed(&buffer)));
 }

 void StreamSubscriber::OnEnd(mate::Arguments* args) {
-  base::PostTaskWithTraits(
-      FROM_HERE, {content::BrowserThread::IO},
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO, FROM_HERE,
      base::Bind(&atom::URLRequestStreamJob::OnEnd, url_job_));
 }

 void StreamSubscriber::OnError(mate::Arguments* args) {
-  base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                           base::Bind(&atom::URLRequestStreamJob::OnError,
-                                      url_job_, net::ERR_FAILED));
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(&atom::URLRequestStreamJob::OnError, url_job_,
+                 net::ERR_FAILED));
 }

 void StreamSubscriber::RemoveAllListeners() {
--- a/atom/browser/api/views/atom_api_button.cc
+++ b/atom/browser/api/views/atom_api_button.cc
@@ -13,10 +13,8 @@ namespace atom {

 namespace api {

-Button::Button(views::Button* impl) : View(impl) {
+Button::Button(views::Button* button) : View(button) {
  view()->set_owned_by_client();
-  // Make the button focusable as per the platform.
-  button()->SetFocusForPlatform();
 }

 Button::~Button() {}
--- a/atom/browser/api/views/atom_api_button.h
+++ b/atom/browser/api/views/atom_api_button.h
@@ -27,8 +27,6 @@ class Button : public View, public views::ButtonListener {
  // views::ButtonListener:
  void ButtonPressed(views::Button* sender, const ui::Event& event) override;

-  views::Button* button() const { return static_cast<views::Button*>(view()); }
-
 private:
  DISALLOW_COPY_AND_ASSIGN(Button);
 };
--- a/atom/browser/api/views/atom_api_label_button.cc
+++ b/atom/browser/api/views/atom_api_label_button.cc
@@ -7,6 +7,7 @@
 #include "atom/common/api/constructor.h"
 #include "base/strings/utf_string_conversions.h"
 #include "native_mate/dictionary.h"
+#include "ui/views/controls/button/label_button.h"

 #include "atom/common/node_includes.h"

@@ -14,29 +15,11 @@ namespace atom {

 namespace api {

-LabelButton::LabelButton(views::LabelButton* impl) : Button(impl) {}
-
 LabelButton::LabelButton(const std::string& text)
    : Button(new views::LabelButton(this, base::UTF8ToUTF16(text))) {}

 LabelButton::~LabelButton() {}

-const base::string16& LabelButton::GetText() const {
-  return label_button()->GetText();
-}
-
-void LabelButton::SetText(const base::string16& text) {
-  label_button()->SetText(text);
-}
-
-bool LabelButton::IsDefault() const {
-  return label_button()->is_default();
-}
-
-void LabelButton::SetIsDefault(bool is_default) {
-  label_button()->SetIsDefault(is_default);
-}
-
 // static
 mate::WrappableBase* LabelButton::New(mate::Arguments* args,
                                      const std::string& text) {
@@ -50,11 +33,6 @@ mate::WrappableBase* LabelButton::New(mate::Arguments* args,
 void LabelButton::BuildPrototype(v8::Isolate* isolate,
                                 v8::Local<v8::FunctionTemplate> prototype) {
  prototype->SetClassName(mate::StringToV8(isolate, "LabelButton"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("getText", &LabelButton::GetText)
-      .SetMethod("setText", &LabelButton::SetText)
-      .SetMethod("isDefault", &LabelButton::IsDefault)
-      .SetMethod("setIsDefault", &LabelButton::SetIsDefault);
 }

 }  // namespace api
--- a/atom/browser/api/views/atom_api_label_button.h
+++ b/atom/browser/api/views/atom_api_label_button.h
@@ -8,7 +8,6 @@
 #include <string>

 #include "atom/browser/api/views/atom_api_button.h"
-#include "ui/views/controls/button/label_button.h"

 namespace atom {

@@ -22,20 +21,10 @@ class LabelButton : public Button {
  static void BuildPrototype(v8::Isolate* isolate,
                             v8::Local<v8::FunctionTemplate> prototype);

-  const base::string16& GetText() const;
-  void SetText(const base::string16& text);
-  bool IsDefault() const;
-  void SetIsDefault(bool is_default);
-
 protected:
-  explicit LabelButton(views::LabelButton* impl);
  explicit LabelButton(const std::string& text);
  ~LabelButton() override;

-  views::LabelButton* label_button() const {
-    return static_cast<views::LabelButton*>(view());
-  }
-
 private:
  DISALLOW_COPY_AND_ASSIGN(LabelButton);
 };
--- a/atom/browser/api/views/atom_api_md_text_button.cc
+++ b/atom/browser/api/views/atom_api_md_text_button.cc
@@ -1,57 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/views/atom_api_md_text_button.h"
-
-#include "atom/common/api/constructor.h"
-#include "base/strings/utf_string_conversions.h"
-#include "native_mate/dictionary.h"
-
-#include "atom/common/node_includes.h"
-
-namespace atom {
-
-namespace api {
-
-MdTextButton::MdTextButton(const std::string& text)
-    : LabelButton(views::MdTextButton::Create(this, base::UTF8ToUTF16(text))) {}
-
-MdTextButton::~MdTextButton() {}
-
-// static
-mate::WrappableBase* MdTextButton::New(mate::Arguments* args,
-                                       const std::string& text) {
-  // Constructor call.
-  auto* view = new MdTextButton(text);
-  view->InitWith(args->isolate(), args->GetThis());
-  return view;
-}
-
-// static
-void MdTextButton::BuildPrototype(v8::Isolate* isolate,
-                                  v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "MdTextButton"));
-}
-
-}  // namespace api
-
-}  // namespace atom
-
-namespace {
-
-using atom::api::MdTextButton;
-
-void Initialize(v8::Local<v8::Object> exports,
-                v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context,
-                void* priv) {
-  v8::Isolate* isolate = context->GetIsolate();
-  mate::Dictionary dict(isolate, exports);
-  dict.Set("MdTextButton", mate::CreateConstructor<MdTextButton>(
-                               isolate, base::Bind(&MdTextButton::New)));
-}
-
-}  // namespace
-
-NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_md_text_button, Initialize)
--- a/atom/browser/api/views/atom_api_md_text_button.h
+++ b/atom/browser/api/views/atom_api_md_text_button.h
@@ -1,41 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_MD_TEXT_BUTTON_H_
-#define ATOM_BROWSER_API_VIEWS_ATOM_API_MD_TEXT_BUTTON_H_
-
-#include <string>
-
-#include "atom/browser/api/views/atom_api_label_button.h"
-#include "ui/views/controls/button/md_text_button.h"
-
-namespace atom {
-
-namespace api {
-
-class MdTextButton : public LabelButton {
- public:
-  static mate::WrappableBase* New(mate::Arguments* args,
-                                  const std::string& text);
-
-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
- protected:
-  explicit MdTextButton(const std::string& text);
-  ~MdTextButton() override;
-
-  views::MdTextButton* md_text_button() const {
-    return static_cast<views::MdTextButton*>(view());
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MdTextButton);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_VIEWS_ATOM_API_MD_TEXT_BUTTON_H_
--- a/atom/browser/api/views/atom_api_resize_area.cc
+++ b/atom/browser/api/views/atom_api_resize_area.cc
@@ -1,60 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/views/atom_api_resize_area.h"
-
-#include "atom/common/api/constructor.h"
-#include "native_mate/dictionary.h"
-
-#include "atom/common/node_includes.h"
-
-namespace atom {
-
-namespace api {
-
-ResizeArea::ResizeArea() : View(new views::ResizeArea(this)) {
-  view()->set_owned_by_client();
-}
-
-ResizeArea::~ResizeArea() {}
-
-void ResizeArea::OnResize(int resize_amount, bool done_resizing) {
-  Emit("resize", resize_amount, done_resizing);
-}
-
-// static
-mate::WrappableBase* ResizeArea::New(mate::Arguments* args) {
-  // Constructor call.
-  auto* view = new ResizeArea();
-  view->InitWith(args->isolate(), args->GetThis());
-  return view;
-}
-
-// static
-void ResizeArea::BuildPrototype(v8::Isolate* isolate,
-                                v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "ResizeArea"));
-}
-
-}  // namespace api
-
-}  // namespace atom
-
-namespace {
-
-using atom::api::ResizeArea;
-
-void Initialize(v8::Local<v8::Object> exports,
-                v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context,
-                void* priv) {
-  v8::Isolate* isolate = context->GetIsolate();
-  mate::Dictionary dict(isolate, exports);
-  dict.Set("ResizeArea", mate::CreateConstructor<ResizeArea>(
-                             isolate, base::Bind(&ResizeArea::New)));
-}
-
-}  // namespace
-
-NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_resize_area, Initialize)
--- a/atom/browser/api/views/atom_api_resize_area.h
+++ b/atom/browser/api/views/atom_api_resize_area.h
@@ -1,43 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_RESIZE_AREA_H_
-#define ATOM_BROWSER_API_VIEWS_ATOM_API_RESIZE_AREA_H_
-
-#include "atom/browser/api/atom_api_view.h"
-#include "native_mate/handle.h"
-#include "ui/views/controls/resize_area.h"
-#include "ui/views/controls/resize_area_delegate.h"
-
-namespace atom {
-
-namespace api {
-
-class ResizeArea : public View, protected views::ResizeAreaDelegate {
- public:
-  static mate::WrappableBase* New(mate::Arguments* args);
-
-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
- protected:
-  void OnResize(int resize_amount, bool done_resizing) override;
-
- private:
-  ResizeArea();
-  ~ResizeArea() override;
-
-  views::ResizeArea* resize_area() const {
-    return static_cast<views::ResizeArea*>(view());
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ResizeArea);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_VIEWS_ATOM_API_RESIZE_AREA_H_
--- a/atom/browser/atom_blob_reader.cc
+++ b/atom/browser/atom_blob_reader.cc
@@ -6,9 +6,7 @@

 #include <utility>

-#include "base/task/post_task.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ -62,8 +60,8 @@ void AtomBlobReader::StartReading(
  auto blob_data_handle = blob_context_->context()->GetBlobDataFromUUID(uuid);
  auto callback = base::Bind(&RunCallbackInUI, completion_callback);
  if (!blob_data_handle) {
-    base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                             base::BindOnce(callback, nullptr, 0));
+    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                            base::BindOnce(callback, nullptr, 0));
    return;
  }

@@ -118,8 +116,8 @@ void AtomBlobReader::BlobReadHelper::DidReadBlobData(

  char* data = new char[size];
  memcpy(data, blob_data->data(), size);
-  base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                           base::BindOnce(completion_callback_, data, size));
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                          base::BindOnce(completion_callback_, data, size));
  delete this;
 }

--- a/atom/browser/atom_browser_client.cc
+++ b/atom/browser/atom_browser_client.cc
@@ -21,35 +21,28 @@
 #include "atom/browser/atom_resource_dispatcher_host_delegate.h"
 #include "atom/browser/atom_speech_recognition_manager_delegate.h"
 #include "atom/browser/child_web_contents_tracker.h"
-#include "atom/browser/font_defaults.h"
 #include "atom/browser/io_thread.h"
-#include "atom/browser/media/media_capture_devices_dispatcher.h"
 #include "atom/browser/native_window.h"
-#include "atom/browser/notifications/notification_presenter.h"
-#include "atom/browser/notifications/platform_notification_service.h"
 #include "atom/browser/session_preferences.h"
-#include "atom/browser/ui/devtools_manager_delegate.h"
 #include "atom/browser/web_contents_permission_helper.h"
 #include "atom/browser/web_contents_preferences.h"
 #include "atom/browser/window_list.h"
+#include "atom/common/google_api_key.h"
 #include "atom/common/options_switches.h"
 #include "atom/common/platform_util.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
-#include "base/lazy_instance.h"
 #include "base/no_destructor.h"
-#include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task.h"
-#include "chrome/browser/browser_process.h"
+#include "chrome/browser/printing/printing_message_filter.h"
+#include "chrome/browser/speech/tts_message_filter.h"
 #include "components/net_log/chrome_net_log.h"
 #include "content/public/browser/browser_ppapi_host.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ -67,11 +60,9 @@
 #include "net/base/escape.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ppapi/host/ppapi_host.h"
-#include "printing/buildflags/buildflags.h"
 #include "services/device/public/cpp/geolocation/location_provider.h"
 #include "services/network/public/cpp/resource_request_body.h"
 #include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
-#include "services/service_manager/sandbox/switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "v8/include/v8.h"
@@ -94,17 +85,6 @@
 #include "atom/browser/fake_location_provider.h"
 #endif  // BUILDFLAG(OVERRIDE_LOCATION_PROVIDER)

-#if BUILDFLAG(ENABLE_TTS)
-#include "chrome/browser/speech/tts_controller_delegate_impl.h"
-#include "chrome/browser/speech/tts_message_filter.h"
-#endif  // BUILDFLAG(ENABLE_TTS)
-
-#if BUILDFLAG(ENABLE_PRINTING)
-#include "chrome/browser/printing/printing_message_filter.h"
-#include "chrome/services/printing/public/mojom/constants.mojom.h"
-#include "components/services/pdf_compositor/public/interfaces/pdf_compositor.mojom.h"
-#endif  // BUILDFLAG(ENABLE_PRINTING)
-
 using content::BrowserThread;

 namespace atom {
@@ -114,6 +94,9 @@ namespace {
 // Next navigation should not restart renderer process.
 bool g_suppress_renderer_process_restart = false;

+// Custom schemes to be registered to handle service worker.
+base::NoDestructor<std::string> g_custom_service_worker_schemes;
+
 bool IsSameWebSite(content::BrowserContext* browser_context,
                   const GURL& src_url,
                   const GURL& dest_url) {
@@ -126,18 +109,6 @@ bool IsSameWebSite(content::BrowserContext* browser_context,
             src_url;
 }

-AtomBrowserClient* g_browser_client = nullptr;
-
-base::LazyInstance<std::string>::DestructorAtExit
-    g_io_thread_application_locale = LAZY_INSTANCE_INITIALIZER;
-
-base::NoDestructor<std::string> g_application_locale;
-
-void SetApplicationLocaleOnIOThread(const std::string& locale) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  g_io_thread_application_locale.Get() = locale;
-}
-
 }  // namespace

 // static
@@ -145,35 +116,19 @@ void AtomBrowserClient::SuppressRendererProcessRestartForOnce() {
  g_suppress_renderer_process_restart = true;
 }

-AtomBrowserClient* AtomBrowserClient::Get() {
-  return g_browser_client;
+void AtomBrowserClient::SetCustomServiceWorkerSchemes(
+    const std::vector<std::string>& schemes) {
+  *g_custom_service_worker_schemes = base::JoinString(schemes, ",");
 }

-// static
-void AtomBrowserClient::SetApplicationLocale(const std::string& locale) {
-  if (!BrowserThread::IsThreadInitialized(BrowserThread::IO) ||
-      !base::PostTaskWithTraits(
-          FROM_HERE, {BrowserThread::IO},
-          base::BindOnce(&SetApplicationLocaleOnIOThread, locale))) {
-    g_io_thread_application_locale.Get() = locale;
-  }
-  *g_application_locale = locale;
-}
+AtomBrowserClient::AtomBrowserClient() {}

-AtomBrowserClient::AtomBrowserClient() {
-  DCHECK(!g_browser_client);
-  g_browser_client = this;
-}
-
-AtomBrowserClient::~AtomBrowserClient() {
-  DCHECK(g_browser_client);
-  g_browser_client = nullptr;
-}
+AtomBrowserClient::~AtomBrowserClient() {}

 content::WebContents* AtomBrowserClient::GetWebContentsFromProcessID(
    int process_id) {
  // If the process is a pending process, we should use the web contents
-  // for the frame host passed into RegisterPendingProcess.
+  // for the frame host passed into OverrideSiteInstanceForNavigation.
  if (base::ContainsKey(pending_processes_, process_id))
    return pending_processes_[process_id];

@@ -182,37 +137,25 @@ content::WebContents* AtomBrowserClient::GetWebContentsFromProcessID(
  return WebContentsPreferences::GetWebContentsFromProcessID(process_id);
 }

-bool AtomBrowserClient::ShouldForceNewSiteInstance(
-    content::RenderFrameHost* current_rfh,
-    content::RenderFrameHost* speculative_rfh,
+bool AtomBrowserClient::ShouldCreateNewSiteInstance(
+    content::RenderFrameHost* render_frame_host,
    content::BrowserContext* browser_context,
-    const GURL& url,
-    bool has_response_started) const {
+    content::SiteInstance* current_instance,
+    const GURL& url) {
  if (url.SchemeIs(url::kJavaScriptScheme))
    // "javacript:" scheme should always use same SiteInstance
    return false;

-  content::SiteInstance* current_instance = current_rfh->GetSiteInstance();
-  content::SiteInstance* speculative_instance =
-      speculative_rfh ? speculative_rfh->GetSiteInstance() : nullptr;
  int process_id = current_instance->GetProcess()->GetID();
-  if (NavigationWasRedirectedCrossSite(browser_context, current_instance,
-                                       speculative_instance, url,
-                                       has_response_started)) {
-    // Navigation was redirected. We can't force the current, speculative or a
-    // new unrelated site instance to be used. Delegate to the content layer.
-    return false;
-  } else if (IsRendererSandboxed(process_id)) {
-    // Renderer is sandboxed, delegate the decision to the content layer for all
-    // origins.
-    return false;
-  } else if (!RendererUsesNativeWindowOpen(process_id)) {
-    // non-sandboxed renderers without native window.open should always create
-    // a new SiteInstance
-    return true;
-  } else {
-    auto* web_contents = content::WebContents::FromRenderFrameHost(current_rfh);
-    if (!ChildWebContentsTracker::FromWebContents(web_contents)) {
+  if (!IsRendererSandboxed(process_id)) {
+    if (!RendererUsesNativeWindowOpen(process_id)) {
+      // non-sandboxed renderers without native window.open should always create
+      // a new SiteInstance
+      return true;
+    }
+    auto* web_contents =
+        content::WebContents::FromRenderFrameHost(render_frame_host);
+    if (!ChildWebContentsTracker::IsChildWebContents(web_contents)) {
      // Root WebContents should always create new process to make sure
      // native addons are loaded correctly after reload / navigation.
      // (Non-root WebContents opened by window.open() should try to
@@ -226,101 +169,35 @@ bool AtomBrowserClient::ShouldForceNewSiteInstance(
  return !IsSameWebSite(browser_context, src_url, url);
 }

-bool AtomBrowserClient::NavigationWasRedirectedCrossSite(
-    content::BrowserContext* browser_context,
-    content::SiteInstance* current_instance,
-    content::SiteInstance* speculative_instance,
-    const GURL& dest_url,
-    bool has_response_started) const {
-  bool navigation_was_redirected = false;
-  if (has_response_started) {
-    navigation_was_redirected = !IsSameWebSite(
-        browser_context, current_instance->GetSiteURL(), dest_url);
-  } else {
-    navigation_was_redirected =
-        speculative_instance &&
-        !IsSameWebSite(browser_context, speculative_instance->GetSiteURL(),
-                       dest_url);
-  }
-
-  return navigation_was_redirected;
-}
-
 void AtomBrowserClient::AddProcessPreferences(
    int process_id,
    AtomBrowserClient::ProcessPreferences prefs) {
-  base::AutoLock auto_lock(process_preferences_lock_);
  process_preferences_[process_id] = prefs;
 }

 void AtomBrowserClient::RemoveProcessPreferences(int process_id) {
-  base::AutoLock auto_lock(process_preferences_lock_);
  process_preferences_.erase(process_id);
 }

-bool AtomBrowserClient::IsProcessObserved(int process_id) const {
-  base::AutoLock auto_lock(process_preferences_lock_);
+bool AtomBrowserClient::IsProcessObserved(int process_id) {
  return process_preferences_.find(process_id) != process_preferences_.end();
 }

-bool AtomBrowserClient::IsRendererSandboxed(int process_id) const {
-  base::AutoLock auto_lock(process_preferences_lock_);
+bool AtomBrowserClient::IsRendererSandboxed(int process_id) {
  auto it = process_preferences_.find(process_id);
  return it != process_preferences_.end() && it->second.sandbox;
 }

-bool AtomBrowserClient::RendererUsesNativeWindowOpen(int process_id) const {
-  base::AutoLock auto_lock(process_preferences_lock_);
+bool AtomBrowserClient::RendererUsesNativeWindowOpen(int process_id) {
  auto it = process_preferences_.find(process_id);
  return it != process_preferences_.end() && it->second.native_window_open;
 }

-bool AtomBrowserClient::RendererDisablesPopups(int process_id) const {
-  base::AutoLock auto_lock(process_preferences_lock_);
+bool AtomBrowserClient::RendererDisablesPopups(int process_id) {
  auto it = process_preferences_.find(process_id);
  return it != process_preferences_.end() && it->second.disable_popups;
 }

-std::string AtomBrowserClient::GetAffinityPreference(
-    content::RenderFrameHost* rfh) const {
-  auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
-  auto* web_preferences = WebContentsPreferences::From(web_contents);
-  std::string affinity;
-  if (web_preferences &&
-      web_preferences->GetPreference("affinity", &affinity) &&
-      !affinity.empty()) {
-    affinity = base::ToLowerASCII(affinity);
-  }
-
-  return affinity;
-}
-
-content::SiteInstance* AtomBrowserClient::GetSiteInstanceFromAffinity(
-    content::BrowserContext* browser_context,
-    const GURL& url,
-    content::RenderFrameHost* rfh) const {
-  std::string affinity = GetAffinityPreference(rfh);
-  if (!affinity.empty()) {
-    auto iter = site_per_affinities_.find(affinity);
-    GURL dest_site = content::SiteInstance::GetSiteForURL(browser_context, url);
-    if (iter != site_per_affinities_.end() &&
-        IsSameWebSite(browser_context, iter->second->GetSiteURL(), dest_site)) {
-      return iter->second;
-    }
-  }
-
-  return nullptr;
-}
-
-void AtomBrowserClient::ConsiderSiteInstanceForAffinity(
-    content::RenderFrameHost* rfh,
-    content::SiteInstance* site_instance) {
-  std::string affinity = GetAffinityPreference(rfh);
-  if (!affinity.empty()) {
-    site_per_affinities_[affinity] = site_instance;
-  }
-}
-
 void AtomBrowserClient::RenderProcessWillLaunch(
    content::RenderProcessHost* host,
    service_manager::mojom::ServiceRequest* service_request) {
@@ -329,14 +206,8 @@ void AtomBrowserClient::RenderProcessWillLaunch(
  if (IsProcessObserved(process_id))
    return;

-#if BUILDFLAG(ENABLE_PRINTING)
-  host->AddFilter(new printing::PrintingMessageFilter(
-      process_id, host->GetBrowserContext()));
-#endif
-
-#if BUILDFLAG(ENABLE_TTS)
-  host->AddFilter(new TtsMessageFilter(host->GetBrowserContext()));
-#endif
+  host->AddFilter(new printing::PrintingMessageFilter(process_id));
+  host->AddFilter(new TtsMessageFilter(process_id, host->GetBrowserContext()));

  ProcessPreferences prefs;
  auto* web_preferences =
@@ -346,8 +217,6 @@ void AtomBrowserClient::RenderProcessWillLaunch(
    prefs.native_window_open =
        web_preferences->IsEnabled(options::kNativeWindowOpen);
    prefs.disable_popups = web_preferences->IsEnabled("disablePopups");
-    prefs.web_security = web_preferences->IsEnabled(options::kWebSecurity,
-                                                    true /* default value */);
  }
  AddProcessPreferences(host->GetID(), prefs);
  // ensure the ProcessPreferences is removed later
@@ -359,14 +228,6 @@ AtomBrowserClient::CreateSpeechRecognitionManagerDelegate() {
  return new AtomSpeechRecognitionManagerDelegate;
 }

-content::TtsControllerDelegate* AtomBrowserClient::GetTtsControllerDelegate() {
-#if BUILDFLAG(ENABLE_TTS)
-  return TtsControllerDelegateImpl::GetInstance();
-#else
-  return nullptr;
-#endif
-}
-
 void AtomBrowserClient::OverrideWebkitPrefs(content::RenderViewHost* host,
                                            content::WebPreferences* prefs) {
  prefs->javascript_enabled = true;
@@ -387,8 +248,6 @@ void AtomBrowserClient::OverrideWebkitPrefs(content::RenderViewHost* host,
  prefs->default_maximum_page_scale_factor = 1.f;
  prefs->navigate_on_drag_drop = false;

-  SetFontDefaults(prefs);
-
  // Custom preferences of guest page.
  auto* web_contents = content::WebContents::FromRenderViewHost(host);
  auto* web_preferences = WebContentsPreferences::From(web_contents);
@@ -396,59 +255,62 @@ void AtomBrowserClient::OverrideWebkitPrefs(content::RenderViewHost* host,
    web_preferences->OverrideWebkitPrefs(prefs);
 }

-content::ContentBrowserClient::SiteInstanceForNavigationType
-AtomBrowserClient::ShouldOverrideSiteInstanceForNavigation(
-    content::RenderFrameHost* current_rfh,
-    content::RenderFrameHost* speculative_rfh,
+void AtomBrowserClient::OverrideSiteInstanceForNavigation(
+    content::RenderFrameHost* rfh,
    content::BrowserContext* browser_context,
    const GURL& url,
-    bool has_response_started,
-    content::SiteInstance** affinity_site_instance) const {
+    bool has_request_started,
+    content::SiteInstance* candidate_instance,
+    content::SiteInstance** new_instance) {
  if (g_suppress_renderer_process_restart) {
    g_suppress_renderer_process_restart = false;
-    return SiteInstanceForNavigationType::ASK_CHROMIUM;
+    return;
  }

+  content::SiteInstance* current_instance = rfh->GetSiteInstance();
+  if (!ShouldCreateNewSiteInstance(rfh, browser_context, current_instance, url))
+    return;
+
  // Do we have an affinity site to manage ?
-  content::SiteInstance* site_instance_from_affinity =
-      GetSiteInstanceFromAffinity(browser_context, url, current_rfh);
-  if (site_instance_from_affinity) {
-    *affinity_site_instance = site_instance_from_affinity;
-    return SiteInstanceForNavigationType::FORCE_AFFINITY;
-  }
-
-  if (!ShouldForceNewSiteInstance(current_rfh, speculative_rfh, browser_context,
-                                  url, has_response_started)) {
-    return SiteInstanceForNavigationType::ASK_CHROMIUM;
-  }
-
-  // ShouldOverrideSiteInstanceForNavigation will be called more than once
-  // during a navigation (currently twice, on request and when it's about
-  // to commit in the renderer), look at
-  // RenderFrameHostManager::GetFrameHostForNavigation.
-  // In the default mode we should reuse the same site instance until the
-  // request commits otherwise it will get destroyed. Currently there is no
-  // unique lifetime tracker for a navigation request during site instance
-  // creation. We check for the state of the request, which should be one of
-  // (WAITING_FOR_RENDERER_RESPONSE, STARTED, RESPONSE_STARTED, FAILED) along
-  // with the availability of a speculative render frame host.
-  if (has_response_started) {
-    return SiteInstanceForNavigationType::FORCE_CURRENT;
-  }
-
-  return SiteInstanceForNavigationType::FORCE_CANDIDATE_OR_NEW;
-}
-
-void AtomBrowserClient::RegisterPendingSiteInstance(
-    content::RenderFrameHost* rfh,
-    content::SiteInstance* pending_site_instance) {
-  // Do we have an affinity site to manage?
-  ConsiderSiteInstanceForAffinity(rfh, pending_site_instance);
-
-  // Remember the original web contents for the pending renderer process.
  auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
-  auto* pending_process = pending_site_instance->GetProcess();
-  pending_processes_[pending_process->GetID()] = web_contents;
+  auto* web_preferences = WebContentsPreferences::From(web_contents);
+  std::string affinity;
+  if (web_preferences &&
+      web_preferences->GetPreference("affinity", &affinity) &&
+      !affinity.empty()) {
+    affinity = base::ToLowerASCII(affinity);
+    auto iter = site_per_affinities.find(affinity);
+    GURL dest_site = content::SiteInstance::GetSiteForURL(browser_context, url);
+    if (iter != site_per_affinities.end() &&
+        IsSameWebSite(browser_context, iter->second->GetSiteURL(), dest_site)) {
+      *new_instance = iter->second;
+    } else {
+      site_per_affinities[affinity] = candidate_instance;
+      *new_instance = candidate_instance;
+      // Remember the original web contents for the pending renderer process.
+      auto* pending_process = candidate_instance->GetProcess();
+      pending_processes_[pending_process->GetID()] = web_contents;
+    }
+  } else {
+    // OverrideSiteInstanceForNavigation will be called more than once during a
+    // navigation (currently twice, on request and when it's about to commit in
+    // the renderer), look at RenderFrameHostManager::GetFrameHostForNavigation.
+    // In the default mode we should resuse the same site instance until the
+    // request commits otherwise it will get destroyed. Currently there is no
+    // unique lifetime tracker for a navigation request during site instance
+    // creation. We check for the state of the request, which should be one of
+    // (WAITING_FOR_RENDERER_RESPONSE, STARTED, RESPONSE_STARTED, FAILED) along
+    // with the availability of a speculative render frame host.
+    if (has_request_started) {
+      *new_instance = current_instance;
+      return;
+    }
+
+    *new_instance = candidate_instance;
+    // Remember the original web contents for the pending renderer process.
+    auto* pending_process = candidate_instance->GetProcess();
+    pending_processes_[pending_process->GetID()] = web_contents;
+  }
 }

 void AtomBrowserClient::AppendExtraCommandLineSwitches(
@@ -469,15 +331,18 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
    return;

  // Copy following switches to child process.
-  static const char* const kCommonSwitchNames[] = {
-      switches::kStandardSchemes,     switches::kEnableSandbox,
-      switches::kSecureSchemes,       switches::kBypassCSPSchemes,
-      switches::kCORSSchemes,         switches::kFetchSchemes,
-      switches::kServiceWorkerSchemes};
+  static const char* const kCommonSwitchNames[] = {switches::kStandardSchemes,
+                                                   switches::kEnableSandbox,
+                                                   switches::kSecureSchemes};
  command_line->CopySwitchesFrom(*base::CommandLine::ForCurrentProcess(),
                                 kCommonSwitchNames,
                                 arraysize(kCommonSwitchNames));

+  // The registered service worker schemes.
+  if (!g_custom_service_worker_schemes->empty())
+    command_line->AppendSwitchASCII(switches::kRegisterServiceWorkerSchemes,
+                                    *g_custom_service_worker_schemes);
+
 #if defined(OS_WIN)
  // Append --app-user-model-id.
  PWSTR current_app_id;
@@ -494,16 +359,6 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(

  content::WebContents* web_contents = GetWebContentsFromProcessID(process_id);
  if (web_contents) {
-    // devtools processes must be launched unsandboxed in order for the remote
-    // API to work in devtools extensions. This is due to the fact that the
-    // remote API assumes that it will only be used from the main frame, but
-    // devtools extensions are loaded from an iframe.
-    // It would be possible to sandbox devtools extensions processes by default
-    // if we made the remote API work with multiple frames.
-    if (web_contents->GetVisibleURL().SchemeIs("chrome-devtools")) {
-      command_line->AppendSwitch(service_manager::switches::kNoSandbox);
-      command_line->AppendSwitch(::switches::kNoZygote);
-    }
    auto* web_preferences = WebContentsPreferences::From(web_contents);
    if (web_preferences)
      web_preferences->AppendCommandLineSwitches(command_line);
@@ -519,11 +374,11 @@ void AtomBrowserClient::DidCreatePpapiPlugin(content::BrowserPpapiHost* host) {
 #endif
 }

-// attempt to get api key from env
 std::string AtomBrowserClient::GetGeolocationApiKey() {
  std::unique_ptr<base::Environment> env(base::Environment::Create());
  std::string api_key;
-  env->GetVar("GOOGLE_API_KEY", &api_key);
+  if (!env->GetVar("GOOGLE_API_KEY", &api_key))
+    api_key = GOOGLEAPIS_API_KEY;
  return api_key;
 }

@@ -532,17 +387,6 @@ AtomBrowserClient::CreateQuotaPermissionContext() {
  return new AtomQuotaPermissionContext;
 }

-content::GeneratedCodeCacheSettings
-AtomBrowserClient::GetGeneratedCodeCacheSettings(
-    content::BrowserContext* context) {
-  // TODO(deepak1556): Use platform cache directory.
-  base::FilePath cache_path = context->GetPath();
-  // If we pass 0 for size, disk_cache will pick a default size using the
-  // heuristics based on available disk size. These are implemented in
-  // disk_cache::PreferredCacheSize in net/disk_cache/cache_util.cc.
-  return content::GeneratedCodeCacheSettings(true, 0, cache_path);
-}
-
 void AtomBrowserClient::AllowCertificateError(
    content::WebContents* web_contents,
    int cert_error,
@@ -635,19 +479,14 @@ void AtomBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
  additional_schemes->push_back(content::kChromeDevToolsScheme);
 }

-void AtomBrowserClient::GetAdditionalWebUISchemes(
-    std::vector<std::string>* additional_schemes) {
-  additional_schemes->push_back(content::kChromeDevToolsScheme);
-}
-
 void AtomBrowserClient::SiteInstanceDeleting(
    content::SiteInstance* site_instance) {
  // We are storing weak_ptr, is it fundamental to maintain the map up-to-date
  // when an instance is destroyed.
-  for (auto iter = site_per_affinities_.begin();
-       iter != site_per_affinities_.end(); ++iter) {
+  for (auto iter = site_per_affinities.begin();
+       iter != site_per_affinities.end(); ++iter) {
    if (iter->second == site_instance) {
-      site_per_affinities_.erase(iter);
+      site_per_affinities.erase(iter);
      break;
    }
  }
@@ -690,16 +529,6 @@ void AtomBrowserClient::RegisterOutOfProcessServices(
  (*services)[proxy_resolver::mojom::kProxyResolverServiceName] =
      base::BindRepeating(&l10n_util::GetStringUTF16,
                          IDS_UTILITY_PROCESS_PROXY_RESOLVER_NAME);
-
-#if BUILDFLAG(ENABLE_PRINTING)
-  (*services)[printing::mojom::kServiceName] =
-      base::BindRepeating(&l10n_util::GetStringUTF16,
-                          IDS_UTILITY_PROCESS_PDF_COMPOSITOR_SERVICE_NAME);
-
-  (*services)[printing::mojom::kChromePrintingServiceName] =
-      base::BindRepeating(&l10n_util::GetStringUTF16,
-                          IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME);
-#endif
 }

 std::unique_ptr<base::Value> AtomBrowserClient::GetServiceManifestOverlay(
@@ -719,10 +548,10 @@ std::unique_ptr<base::Value> AtomBrowserClient::GetServiceManifestOverlay(
 }

 net::NetLog* AtomBrowserClient::GetNetLog() {
-  return g_browser_process->net_log();
+  return AtomBrowserMainParts::Get()->net_log();
 }

-content::BrowserMainParts* AtomBrowserClient::CreateBrowserMainParts(
+brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
    const content::MainFunctionParams& params) {
  return new AtomBrowserMainParts(params);
 }
@@ -811,11 +640,9 @@ bool AtomBrowserClient::HandleExternalProtocol(
    content::NavigationUIData* navigation_data,
    bool is_main_frame,
    ui::PageTransition page_transition,
-    bool has_user_gesture,
-    const std::string& method,
-    const net::HttpRequestHeaders& headers) {
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
+    bool has_user_gesture) {
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
      base::BindOnce(&HandleExternalProtocolInUI, url, web_contents_getter,
                     has_user_gesture));
  return true;
@@ -829,70 +656,4 @@ AtomBrowserClient::CreateThrottlesForNavigation(
  return throttles;
 }

-content::MediaObserver* AtomBrowserClient::GetMediaObserver() {
-  return MediaCaptureDevicesDispatcher::GetInstance();
-}
-
-content::DevToolsManagerDelegate*
-AtomBrowserClient::GetDevToolsManagerDelegate() {
-  return new DevToolsManagerDelegate;
-}
-
-NotificationPresenter* AtomBrowserClient::GetNotificationPresenter() {
-  if (!notification_presenter_) {
-    notification_presenter_.reset(NotificationPresenter::Create());
-  }
-  return notification_presenter_.get();
-}
-
-content::PlatformNotificationService*
-AtomBrowserClient::GetPlatformNotificationService() {
-  if (!notification_service_) {
-    notification_service_.reset(new PlatformNotificationService(this));
-  }
-  return notification_service_.get();
-}
-
-base::FilePath AtomBrowserClient::GetDefaultDownloadDirectory() {
-  // ~/Downloads
-  base::FilePath path;
-  if (base::PathService::Get(base::DIR_HOME, &path))
-    path = path.Append(FILE_PATH_LITERAL("Downloads"));
-
-  return path;
-}
-
-scoped_refptr<network::SharedURLLoaderFactory>
-AtomBrowserClient::GetSystemSharedURLLoaderFactory() {
-  if (!g_browser_process)
-    return nullptr;
-  return g_browser_process->shared_url_loader_factory();
-}
-
-void AtomBrowserClient::OnNetworkServiceCreated(
-    network::mojom::NetworkService* network_service) {
-  if (!g_browser_process)
-    return;
-  g_browser_process->system_network_context_manager()->OnNetworkServiceCreated(
-      network_service);
-}
-
-bool AtomBrowserClient::ShouldBypassCORB(int render_process_id) const {
-  // This is called on the network thread.
-  base::AutoLock auto_lock(process_preferences_lock_);
-  auto it = process_preferences_.find(render_process_id);
-  return it != process_preferences_.end() && !it->second.web_security;
-}
-
-std::string AtomBrowserClient::GetApplicationLocale() {
-  if (BrowserThread::CurrentlyOn(BrowserThread::IO))
-    return g_io_thread_application_locale.Get();
-  return *g_application_locale;
-}
-
-bool AtomBrowserClient::ShouldEnableStrictSiteIsolation() {
-  // Enable site isolation. It is off by default in Chromium <= 69.
-  return true;
-}
-
 }  // namespace atom
--- a/atom/browser/atom_browser_client.h
+++ b/atom/browser/atom_browser_client.h
@@ -11,8 +11,7 @@
 #include <string>
 #include <vector>

-#include "base/synchronization/lock.h"
-#include "content/public/browser/content_browser_client.h"
+#include "brightray/browser/browser_client.h"
 #include "content/public/browser/render_process_host_observer.h"
 #include "net/ssl/client_cert_identity.h"

@@ -28,15 +27,10 @@ class SSLCertRequestInfo;
 namespace atom {

 class AtomResourceDispatcherHostDelegate;
-class NotificationPresenter;
-class PlatformNotificationService;

-class AtomBrowserClient : public content::ContentBrowserClient,
+class AtomBrowserClient : public brightray::BrowserClient,
                          public content::RenderProcessHostObserver {
 public:
-  static AtomBrowserClient* Get();
-  static void SetApplicationLocale(const std::string& locale);
-
  AtomBrowserClient();
  ~AtomBrowserClient() override;

@@ -49,47 +43,34 @@ class AtomBrowserClient : public content::ContentBrowserClient,
  // Don't force renderer process to restart for once.
  static void SuppressRendererProcessRestartForOnce();

-  NotificationPresenter* GetNotificationPresenter();
+  // Custom schemes to be registered to handle service worker.
+  static void SetCustomServiceWorkerSchemes(
+      const std::vector<std::string>& schemes);

-  void WebNotificationAllowed(int render_process_id,
-                              const base::Callback<void(bool, bool)>& callback);
-
-  // content::NavigatorDelegate
  std::vector<std::unique_ptr<content::NavigationThrottle>>
  CreateThrottlesForNavigation(content::NavigationHandle* handle) override;

-  // content::ContentBrowserClient:
-  std::string GetApplicationLocale() override;
-
-  // content::ContentBrowserClient:
-  bool ShouldEnableStrictSiteIsolation() override;
-
 protected:
+  // content::ContentBrowserClient:
  void RenderProcessWillLaunch(
      content::RenderProcessHost* host,
      service_manager::mojom::ServiceRequest* service_request) override;
  content::SpeechRecognitionManagerDelegate*
  CreateSpeechRecognitionManagerDelegate() override;
-  content::TtsControllerDelegate* GetTtsControllerDelegate() override;
  void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
                           content::WebPreferences* prefs) override;
-  SiteInstanceForNavigationType ShouldOverrideSiteInstanceForNavigation(
-      content::RenderFrameHost* current_rfh,
-      content::RenderFrameHost* speculative_rfh,
-      content::BrowserContext* browser_context,
-      const GURL& url,
-      bool has_request_started,
-      content::SiteInstance** affinity_site_instance) const override;
-  void RegisterPendingSiteInstance(
+  void OverrideSiteInstanceForNavigation(
      content::RenderFrameHost* render_frame_host,
-      content::SiteInstance* pending_site_instance) override;
+      content::BrowserContext* browser_context,
+      const GURL& dest_url,
+      bool has_request_started,
+      content::SiteInstance* candidate_instance,
+      content::SiteInstance** new_instance) override;
  void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
                                      int child_process_id) override;
  void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
  std::string GetGeolocationApiKey() override;
  content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
-  content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings(
-      content::BrowserContext* context) override;
  void AllowCertificateError(
      content::WebContents* web_contents,
      int cert_error,
@@ -122,9 +103,7 @@ class AtomBrowserClient : public content::ContentBrowserClient,
                       bool opener_suppressed,
                       bool* no_javascript_access) override;
  void GetAdditionalAllowedSchemesForFileSystem(
-      std::vector<std::string>* additional_schemes) override;
-  void GetAdditionalWebUISchemes(
-      std::vector<std::string>* additional_schemes) override;
+      std::vector<std::string>* schemes) override;
  void SiteInstanceDeleting(content::SiteInstance* site_instance) override;
  std::unique_ptr<net::ClientCertStore> CreateClientCertStore(
      content::ResourceContext* resource_context) override;
@@ -138,18 +117,13 @@ class AtomBrowserClient : public content::ContentBrowserClient,
  std::unique_ptr<base::Value> GetServiceManifestOverlay(
      base::StringPiece name) override;
  net::NetLog* GetNetLog() override;
-  content::MediaObserver* GetMediaObserver() override;
-  content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
-  content::PlatformNotificationService* GetPlatformNotificationService()
-      override;
-  content::BrowserMainParts* CreateBrowserMainParts(
+
+  // brightray::BrowserClient:
+  brightray::BrowserMainParts* OverrideCreateBrowserMainParts(
      const content::MainFunctionParams&) override;
-  base::FilePath GetDefaultDownloadDirectory() override;
-  scoped_refptr<network::SharedURLLoaderFactory>
-  GetSystemSharedURLLoaderFactory() override;
-  void OnNetworkServiceCreated(
-      network::mojom::NetworkService* network_service) override;
-  bool ShouldBypassCORB(int render_process_id) const override;
+  void WebNotificationAllowed(
+      int render_process_id,
+      const base::Callback<void(bool, bool)>& callback) override;

  // content::RenderProcessHostObserver:
  void RenderProcessHostDestroyed(content::RenderProcessHost* host) override;
@@ -164,62 +138,40 @@ class AtomBrowserClient : public content::ContentBrowserClient,
      content::NavigationUIData* navigation_data,
      bool is_main_frame,
      ui::PageTransition page_transition,
-      bool has_user_gesture,
-      const std::string& method,
-      const net::HttpRequestHeaders& headers) override;
+      bool has_user_gesture) override;

 private:
  struct ProcessPreferences {
    bool sandbox = false;
    bool native_window_open = false;
    bool disable_popups = false;
-    bool web_security = true;
  };

-  bool ShouldForceNewSiteInstance(content::RenderFrameHost* current_rfh,
-                                  content::RenderFrameHost* speculative_rfh,
-                                  content::BrowserContext* browser_context,
-                                  const GURL& dest_url,
-                                  bool has_request_started) const;
-  bool NavigationWasRedirectedCrossSite(
-      content::BrowserContext* browser_context,
-      content::SiteInstance* current_instance,
-      content::SiteInstance* speculative_instance,
-      const GURL& dest_url,
-      bool has_request_started) const;
+  bool ShouldCreateNewSiteInstance(content::RenderFrameHost* render_frame_host,
+                                   content::BrowserContext* browser_context,
+                                   content::SiteInstance* current_instance,
+                                   const GURL& dest_url);
  void AddProcessPreferences(int process_id, ProcessPreferences prefs);
  void RemoveProcessPreferences(int process_id);
-  bool IsProcessObserved(int process_id) const;
-  bool IsRendererSandboxed(int process_id) const;
-  bool RendererUsesNativeWindowOpen(int process_id) const;
-  bool RendererDisablesPopups(int process_id) const;
-  std::string GetAffinityPreference(content::RenderFrameHost* rfh) const;
-  content::SiteInstance* GetSiteInstanceFromAffinity(
-      content::BrowserContext* browser_context,
-      const GURL& url,
-      content::RenderFrameHost* rfh) const;
-  void ConsiderSiteInstanceForAffinity(content::RenderFrameHost* rfh,
-                                       content::SiteInstance* site_instance);
+  bool IsProcessObserved(int process_id);
+  bool IsRendererSandboxed(int process_id);
+  bool RendererUsesNativeWindowOpen(int process_id);
+  bool RendererDisablesPopups(int process_id);

  // pending_render_process => web contents.
  std::map<int, content::WebContents*> pending_processes_;

+  std::map<int, ProcessPreferences> process_preferences_;
  std::map<int, base::ProcessId> render_process_host_pids_;

  // list of site per affinity. weak_ptr to prevent instance locking
-  std::map<std::string, content::SiteInstance*> site_per_affinities_;
+  std::map<std::string, content::SiteInstance*> site_per_affinities;

  std::unique_ptr<AtomResourceDispatcherHostDelegate>
      resource_dispatcher_host_delegate_;

-  std::unique_ptr<PlatformNotificationService> notification_service_;
-  std::unique_ptr<NotificationPresenter> notification_presenter_;
-
  Delegate* delegate_ = nullptr;

-  mutable base::Lock process_preferences_lock_;
-  std::map<int, ProcessPreferences> process_preferences_;
-
  DISALLOW_COPY_AND_ASSIGN(AtomBrowserClient);
 };

--- a/atom/browser/atom_browser_context.cc
+++ b/atom/browser/atom_browser_context.cc
@@ -9,18 +9,15 @@
 #include "atom/browser/atom_blob_reader.h"
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/atom_download_manager_delegate.h"
-#include "atom/browser/atom_paths.h"
 #include "atom/browser/atom_permission_manager.h"
 #include "atom/browser/browser.h"
 #include "atom/browser/cookie_change_notifier.h"
 #include "atom/browser/net/resolve_proxy_helper.h"
 #include "atom/browser/pref_store_delegate.h"
 #include "atom/browser/special_storage_policy.h"
-#include "atom/browser/ui/inspectable_web_contents_impl.h"
 #include "atom/browser/web_view_manager.h"
-#include "atom/browser/zoom_level_delegate.h"
-#include "atom/common/application_info.h"
 #include "atom/common/atom_version.h"
+#include "atom/common/chrome_version.h"
 #include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ -29,10 +26,12 @@
 #include "base/strings/stringprintf.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
+#include "brightray/browser/brightray_paths.h"
+#include "brightray/browser/inspectable_web_contents_impl.h"
+#include "brightray/browser/zoom_level_delegate.h"
+#include "brightray/common/application_info.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_version.h"
 #include "chrome/common/pref_names.h"
-#include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/prefs/json_pref_store.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
@@ -100,10 +99,11 @@ AtomBrowserContext::AtomBrowserContext(const std::string& partition,
  base::StringToInt(command_line->GetSwitchValueASCII(switches::kDiskCacheSize),
                    &max_cache_size_);

-  if (!base::PathService::Get(DIR_USER_DATA, &path_)) {
-    base::PathService::Get(DIR_APP_DATA, &path_);
-    path_ = path_.Append(base::FilePath::FromUTF8Unsafe(GetApplicationName()));
-    base::PathService::Override(DIR_USER_DATA, path_);
+  if (!base::PathService::Get(brightray::DIR_USER_DATA, &path_)) {
+    base::PathService::Get(brightray::DIR_APP_DATA, &path_);
+    path_ = path_.Append(
+        base::FilePath::FromUTF8Unsafe(brightray::GetApplicationName()));
+    base::PathService::Override(brightray::DIR_USER_DATA, path_);
  }

  if (!in_memory && !partition.empty())
@@ -119,8 +119,6 @@ AtomBrowserContext::AtomBrowserContext(const std::string& partition,
  proxy_config_monitor_ = std::make_unique<ProxyConfigMonitor>(prefs_.get());
  io_handle_ = new URLRequestContextGetter::Handle(weak_factory_.GetWeakPtr());
  cookie_change_notifier_ = std::make_unique<CookieChangeNotifier>(this);
-
-  BrowserContextDependencyManager::GetInstance()->MarkBrowserContextLive(this);
 }

 AtomBrowserContext::~AtomBrowserContext() {
@@ -128,9 +126,6 @@ AtomBrowserContext::~AtomBrowserContext() {
  NotifyWillBeDestroyed(this);
  ShutdownStoragePartitions();
  io_handle_->ShutdownOnUIThread();
-  // Notify any keyed services of browser context destruction.
-  BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
-      this);
 }

 void AtomBrowserContext::InitPrefs() {
@@ -151,9 +146,9 @@ void AtomBrowserContext::InitPrefs() {
  registry->RegisterFilePathPref(prefs::kDownloadDefaultDirectory,
                                 download_dir);
  registry->RegisterDictionaryPref(prefs::kDevToolsFileSystemPaths);
-  InspectableWebContentsImpl::RegisterPrefs(registry.get());
-  MediaDeviceIDSalt::RegisterPrefs(registry.get());
-  ZoomLevelDelegate::RegisterPrefs(registry.get());
+  brightray::InspectableWebContentsImpl::RegisterPrefs(registry.get());
+  brightray::MediaDeviceIDSalt::RegisterPrefs(registry.get());
+  brightray::ZoomLevelDelegate::RegisterPrefs(registry.get());
  PrefProxyConfigTrackerImpl::RegisterPrefs(registry.get());

  prefs_ = prefs_factory.Create(
@@ -209,7 +204,7 @@ content::ResourceContext* AtomBrowserContext::GetResourceContext() {

 std::string AtomBrowserContext::GetMediaDeviceIDSalt() {
  if (!media_device_id_salt_.get())
-    media_device_id_salt_.reset(new MediaDeviceIDSalt(prefs_.get()));
+    media_device_id_salt_.reset(new brightray::MediaDeviceIDSalt(prefs_.get()));
  return media_device_id_salt_->GetSalt();
 }

@@ -217,7 +212,8 @@ std::unique_ptr<content::ZoomLevelDelegate>
 AtomBrowserContext::CreateZoomLevelDelegate(
    const base::FilePath& partition_path) {
  if (!IsOffTheRecord()) {
-    return std::make_unique<ZoomLevelDelegate>(prefs(), partition_path);
+    return std::make_unique<brightray::ZoomLevelDelegate>(prefs(),
+                                                          partition_path);
  }
  return std::unique_ptr<content::ZoomLevelDelegate>();
 }
--- a/atom/browser/atom_browser_context.h
+++ b/atom/browser/atom_browser_context.h
@@ -10,10 +10,10 @@
 #include <string>
 #include <vector>

-#include "atom/browser/media/media_device_id_salt.h"
 #include "atom/browser/net/url_request_context_getter.h"
 #include "base/memory/ref_counted_delete_on_sequence.h"
 #include "base/memory/weak_ptr.h"
+#include "brightray/browser/media/media_device_id_salt.h"
 #include "chrome/browser/net/proxy_config_monitor.h"
 #include "content/public/browser/browser_context.h"

@@ -152,7 +152,7 @@ class AtomBrowserContext
  std::unique_ptr<WebViewManager> guest_manager_;
  std::unique_ptr<AtomPermissionManager> permission_manager_;
  std::unique_ptr<AtomBlobReader> blob_reader_;
-  std::unique_ptr<MediaDeviceIDSalt> media_device_id_salt_;
+  std::unique_ptr<brightray::MediaDeviceIDSalt> media_device_id_salt_;
  scoped_refptr<ResolveProxyHelper> resolve_proxy_helper_;
  scoped_refptr<storage::SpecialStoragePolicy> storage_policy_;

--- a/atom/browser/atom_browser_main_parts.cc
+++ b/atom/browser/atom_browser_main_parts.cc
@@ -6,87 +6,47 @@

 #include <utility>

-#if defined(OS_LINUX)
-#include <glib.h>  // for g_setenv()
-#endif
-
-#include "atom/app/atom_main_delegate.h"
 #include "atom/browser/api/atom_api_app.h"
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/atom_browser_client.h"
 #include "atom/browser/atom_browser_context.h"
-#include "atom/browser/atom_paths.h"
-#include "atom/browser/atom_web_ui_controller_factory.h"
 #include "atom/browser/browser.h"
-#include "atom/browser/browser_process_impl.h"
+#include "atom/browser/io_thread.h"
 #include "atom/browser/javascript_environment.h"
-#include "atom/browser/media/media_capture_devices_dispatcher.h"
 #include "atom/browser/node_debugger.h"
-#include "atom/browser/ui/devtools_manager_delegate.h"
 #include "atom/common/api/atom_bindings.h"
-#include "atom/common/application_info.h"
 #include "atom/common/asar/asar_util.h"
 #include "atom/common/node_bindings.h"
-#include "base/base_switches.h"
 #include "base/command_line.h"
-#include "base/feature_list.h"
-#include "base/message_loop/message_loop.h"
-#include "base/path_service.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/utf_string_conversions.h"
+#include "base/threading/thread_task_runner_handle.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/icon_manager.h"
-#include "content/public/browser/browser_thread.h"
+#include "chrome/browser/net/chrome_net_log_helper.h"
+#include "components/net_log/chrome_net_log.h"
+#include "components/net_log/net_export_file_writer.h"
 #include "content/public/browser/child_process_security_policy.h"
-#include "content/public/browser/web_ui_controller_factory.h"
-#include "content/public/common/content_features.h"
-#include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/service_manager_connection.h"
 #include "electron/buildflags/buildflags.h"
-#include "media/base/localized_strings.h"
 #include "services/device/public/mojom/constants.mojom.h"
+#include "services/network/public/cpp/network_switches.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/base/idle/idle.h"
-#include "ui/base/material_design/material_design_controller.h"
-#include "ui/base/ui_base_switches.h"
-
-#if defined(USE_AURA)
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
-#include "ui/views/widget/desktop_aura/desktop_screen.h"
-#include "ui/wm/core/wm_state.h"
-#endif
+#include "ui/base/l10n/l10n_util.h"

 #if defined(USE_X11)
-#include "base/environment.h"
-#include "base/nix/xdg_util.h"
-#include "base/threading/thread_task_runner_handle.h"
-#include "chrome/browser/ui/libgtkui/gtk_ui.h"
 #include "chrome/browser/ui/libgtkui/gtk_util.h"
-#include "ui/base/x/x11_util.h"
-#include "ui/base/x/x11_util_internal.h"
 #include "ui/events/devices/x11/touch_factory_x11.h"
-#include "ui/views/linux_ui/linux_ui.h"
 #endif

-#if defined(OS_WIN)
-#include "ui/base/cursor/cursor_loader_win.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/l10n/l10n_util_win.h"
-#include "ui/display/win/dpi.h"
-#include "ui/gfx/platform_font_win.h"
-#include "ui/strings/grit/app_locale_settings.h"
-#endif
+#if BUILDFLAG(ENABLE_PDF_VIEWER)
+#include "atom/browser/atom_web_ui_controller_factory.h"
+#endif  // BUILDFLAG(ENABLE_PDF_VIEWER)

 #if defined(OS_MACOSX)
 #include "atom/browser/ui/cocoa/views_delegate_mac.h"
 #else
-#include "atom/browser/ui/views/atom_views_delegate.h"
-#endif
-
-#if defined(OS_LINUX)
-#include "device/bluetooth/bluetooth_adapter_factory.h"
-#include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h"
+#include "brightray/browser/views/views_delegate.h"
 #endif

 // Must be included after all other headers.
@@ -101,137 +61,14 @@ void Erase(T* container, typename T::iterator iter) {
  container->erase(iter);
 }

-#if defined(OS_WIN)
-// gfx::Font callbacks
-void AdjustUIFont(gfx::PlatformFontWin::FontAdjustment* font_adjustment) {
-  l10n_util::NeedOverrideDefaultUIFont(&font_adjustment->font_family_override,
-                                       &font_adjustment->font_scale);
-  font_adjustment->font_scale *= display::win::GetAccessibilityFontScale();
-}
-
-int GetMinimumFontSize() {
-  int min_font_size;
-  base::StringToInt(l10n_util::GetStringUTF16(IDS_MINIMUM_UI_FONT_SIZE),
-                    &min_font_size);
-  return min_font_size;
-}
-#endif
-
-base::string16 MediaStringProvider(media::MessageId id) {
-  switch (id) {
-    case media::DEFAULT_AUDIO_DEVICE_NAME:
-      return base::ASCIIToUTF16("Default");
-#if defined(OS_WIN)
-    case media::COMMUNICATIONS_AUDIO_DEVICE_NAME:
-      return base::ASCIIToUTF16("Communications");
-#endif
-    default:
-      return base::string16();
-  }
-}
-
-#if defined(USE_X11)
-// Indicates that we're currently responding to an IO error (by shutting down).
-bool g_in_x11_io_error_handler = false;
-
-// Number of seconds to wait for UI thread to get an IO error if we get it on
-// the background thread.
-const int kWaitForUIThreadSeconds = 10;
-
-void OverrideLinuxAppDataPath() {
-  base::FilePath path;
-  if (base::PathService::Get(DIR_APP_DATA, &path))
-    return;
-  std::unique_ptr<base::Environment> env(base::Environment::Create());
-  path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar,
-                                    base::nix::kDotConfigDir);
-  base::PathService::Override(DIR_APP_DATA, path);
-}
-
-int BrowserX11ErrorHandler(Display* d, XErrorEvent* error) {
-  if (!g_in_x11_io_error_handler && base::ThreadTaskRunnerHandle::IsSet()) {
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(&ui::LogErrorEventDescription, d, *error));
-  }
-  return 0;
-}
-
-// This function is used to help us diagnose crash dumps that happen
-// during the shutdown process.
-NOINLINE void WaitingForUIThreadToHandleIOError() {
-  // Ensure function isn't optimized away.
-  asm("");
-  sleep(kWaitForUIThreadSeconds);
-}
-
-int BrowserX11IOErrorHandler(Display* d) {
-  if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
-    // Wait for the UI thread (which has a different connection to the X server)
-    // to get the error. We can't call shutdown from this thread without
-    // tripping an error. Doing it through a function so that we'll be able
-    // to see it in any crash dumps.
-    WaitingForUIThreadToHandleIOError();
-    return 0;
-  }
-
-  // If there's an IO error it likely means the X server has gone away.
-  // If this DCHECK fails, then that means SessionEnding() below triggered some
-  // code that tried to talk to the X server, resulting in yet another error.
-  DCHECK(!g_in_x11_io_error_handler);
-
-  g_in_x11_io_error_handler = true;
-  LOG(ERROR) << "X IO error received (X server probably went away)";
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::RunLoop::QuitCurrentWhenIdleClosureDeprecated());
-
-  return 0;
-}
-
-int X11EmptyErrorHandler(Display* d, XErrorEvent* error) {
-  return 0;
-}
-
-int X11EmptyIOErrorHandler(Display* d) {
-  return 0;
-}
-#endif
-
 }  // namespace

-void AtomBrowserMainParts::InitializeFeatureList() {
-  auto* cmd_line = base::CommandLine::ForCurrentProcess();
-  auto enable_features =
-      cmd_line->GetSwitchValueASCII(::switches::kEnableFeatures);
-  auto disable_features =
-      cmd_line->GetSwitchValueASCII(::switches::kDisableFeatures);
-  // Disable creation of spare renderer process with site-per-process mode,
-  // it interferes with our process preference tracking for non sandboxed mode.
-  // Can be reenabled when our site instance policy is aligned with chromium
-  // when node integration is enabled.
-  disable_features +=
-      std::string(",") + features::kSpareRendererForSitePerProcess.name;
-  auto feature_list = std::make_unique<base::FeatureList>();
-  feature_list->InitializeFromCommandLine(enable_features, disable_features);
-  base::FeatureList::SetInstance(std::move(feature_list));
-}
-
-#if !defined(OS_MACOSX)
-void AtomBrowserMainParts::OverrideAppLogsPath() {
-  base::FilePath path;
-  if (base::PathService::Get(DIR_APP_DATA, &path)) {
-    path = path.Append(base::FilePath::FromUTF8Unsafe(GetApplicationName()));
-    path = path.Append(base::FilePath::FromUTF8Unsafe("logs"));
-    base::PathService::Override(DIR_APP_LOGS, path);
-  }
-}
-#endif
-
 // static
 AtomBrowserMainParts* AtomBrowserMainParts::self_ = nullptr;

 AtomBrowserMainParts::AtomBrowserMainParts(
    const content::MainFunctionParams& params)
-    : fake_browser_process_(new BrowserProcessImpl),
+    : fake_browser_process_(new BrowserProcess),
      browser_(new Browser),
      node_bindings_(NodeBindings::Create(NodeBindings::BROWSER)),
      atom_bindings_(new AtomBindings(uv_default_loop())),
@@ -283,17 +120,9 @@ void AtomBrowserMainParts::RegisterDestructionCallback(
 }

 int AtomBrowserMainParts::PreEarlyInitialization() {
-  InitializeFeatureList();
-  OverrideAppLogsPath();
-#if defined(USE_X11)
-  views::LinuxUI::SetInstance(BuildGtkUi());
-  OverrideLinuxAppDataPath();
-
-  // Installs the X11 error handlers for the browser process used during
-  // startup. They simply print error messages and exit because
-  // we can't shutdown properly while creating and initializing services.
-  ui::SetX11ErrorHandlers(nullptr, nullptr);
-#endif
+  const int result = brightray::BrowserMainParts::PreEarlyInitialization();
+  if (result != service_manager::RESULT_CODE_NORMAL_EXIT)
+    return result;

 #if defined(OS_POSIX)
  HandleSIGCHLD();
@@ -303,6 +132,8 @@ int AtomBrowserMainParts::PreEarlyInitialization() {
 }

 void AtomBrowserMainParts::PostEarlyInitialization() {
+  brightray::BrowserMainParts::PostEarlyInitialization();
+
  // A workaround was previously needed because there was no ThreadTaskRunner
  // set.  If this check is failing we may need to re-add that workaround
  DCHECK(base::ThreadTaskRunnerHandle::IsSet());
@@ -330,80 +161,58 @@ void AtomBrowserMainParts::PostEarlyInitialization() {
  // Wrap the uv loop with global env.
  node_bindings_->set_uv_env(env);

-  // We already initialized the feature list in PreEarlyInitialization(), but
+  // We already initialized the feature list in
+  // brightray::BrowserMainParts::PreEarlyInitialization(), but
  // the user JS script would not have had a chance to alter the command-line
  // switches at that point. Lets reinitialize it here to pick up the
  // command-line changes.
  base::FeatureList::ClearInstanceForTesting();
-  InitializeFeatureList();
-
-  // Initialize after user script environment creation.
-  fake_browser_process_->PostEarlyInitialization();
+  brightray::BrowserMainParts::InitializeFeatureList();
 }

 int AtomBrowserMainParts::PreCreateThreads() {
-#if defined(USE_AURA)
-  display::Screen* screen = views::CreateDesktopScreen();
-  display::Screen::SetScreenInstance(screen);
-#if defined(USE_X11)
-  views::LinuxUI::instance()->UpdateDeviceScaleFactor();
-#endif
-#endif
-
-  if (!views::LayoutProvider::Get())
-    layout_provider_.reset(new views::LayoutProvider());
-
-  // Initialize the app locale.
-  fake_browser_process_->SetApplicationLocale(
-      AtomBrowserClient::Get()->GetApplicationLocale());
-
-  // Force MediaCaptureDevicesDispatcher to be created on UI thread.
-  MediaCaptureDevicesDispatcher::GetInstance();
-
-  // Force MediaCaptureDevicesDispatcher to be created on UI thread.
-  MediaCaptureDevicesDispatcher::GetInstance();
+  const int result = brightray::BrowserMainParts::PreCreateThreads();
+  if (!result) {
+    fake_browser_process_->SetApplicationLocale(
+        brightray::BrowserClient::Get()->GetApplicationLocale());
+  }

 #if defined(OS_MACOSX)
  ui::InitIdleMonitor();
 #endif

-  fake_browser_process_->PreCreateThreads(main_function_params_.command_line);
+  net_log_ = std::make_unique<net_log::ChromeNetLog>();
+  auto& command_line = main_function_params_.command_line;
+  // start net log trace if --log-net-log is passed in the command line.
+  if (command_line.HasSwitch(network::switches::kLogNetLog)) {
+    base::FilePath log_file =
+        command_line.GetSwitchValuePath(network::switches::kLogNetLog);
+    if (!log_file.empty()) {
+      net_log_->StartWritingToFile(
+          log_file, GetNetCaptureModeFromCommandLine(command_line),
+          command_line.GetCommandLineString(), std::string());
+    }
+  }
+  // Initialize net log file exporter.
+  net_log_->net_export_file_writer()->Initialize();

-  return 0;
+  // Manage global state of net and other IO thread related.
+  io_thread_ = std::make_unique<IOThread>(net_log_.get());
+
+  return result;
 }

 void AtomBrowserMainParts::PostDestroyThreads() {
-#if defined(OS_LINUX)
-  device::BluetoothAdapterFactory::Shutdown();
-  bluez::DBusBluezManagerWrapperLinux::Shutdown();
-#endif
-  fake_browser_process_->PostDestroyThreads();
+  brightray::BrowserMainParts::PostDestroyThreads();
+  io_thread_.reset();
 }

 void AtomBrowserMainParts::ToolkitInitialized() {
-  ui::MaterialDesignController::Initialize();
-
-#if defined(USE_AURA) && defined(USE_X11)
-  views::LinuxUI::instance()->Initialize();
-#endif
-
-#if defined(USE_AURA)
-  wm_state_.reset(new wm::WMState);
-#endif
-
-#if defined(OS_WIN)
-  gfx::PlatformFontWin::SetAdjustFontCallback(&AdjustUIFont);
-  gfx::PlatformFontWin::SetGetMinimumFontSizeCallback(&GetMinimumFontSize);
-
-  wchar_t module_name[MAX_PATH] = {0};
-  if (GetModuleFileName(NULL, module_name, MAX_PATH))
-    ui::CursorLoaderWin::SetCursorResourceModule(module_name);
-#endif
-
+  brightray::BrowserMainParts::ToolkitInitialized();
 #if defined(OS_MACOSX)
  views_delegate_.reset(new ViewsDelegateMac);
 #else
-  views_delegate_.reset(new ViewsDelegate);
+  views_delegate_.reset(new brightray::ViewsDelegate);
 #endif
 }

@@ -413,9 +222,6 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
  node_bindings_->PrepareMessageLoop();
  node_bindings_->RunMessageLoop();

-  // url::Add*Scheme are not threadsafe, this helps prevent data races.
-  url::LockSchemeRegistries();
-
 #if defined(USE_X11)
  ui::TouchFactory::SetTouchDeviceListFromCommandLine();
 #endif
@@ -425,13 +231,12 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
                  base::Bind(&v8::Isolate::LowMemoryNotification,
                             base::Unretained(js_env_->isolate())));

+#if BUILDFLAG(ENABLE_PDF_VIEWER)
  content::WebUIControllerFactory::RegisterFactory(
      AtomWebUIControllerFactory::GetInstance());
+#endif  // BUILDFLAG(ENABLE_PDF_VIEWER)

-  // --remote-debugging-port
-  auto* command_line = base::CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kRemoteDebuggingPort))
-    DevToolsManagerDelegate::StartHttpHandler();
+  brightray::BrowserMainParts::PreMainMessageLoopRun();

 #if defined(USE_X11)
  libgtkui::GtkInitFromCommandLine(*base::CommandLine::ForCurrentProcess());
@@ -448,38 +253,24 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
 }

 bool AtomBrowserMainParts::MainMessageLoopRun(int* result_code) {
-  js_env_->OnMessageLoopCreated();
  exit_code_ = result_code;
-  return content::BrowserMainParts::MainMessageLoopRun(result_code);
+  return brightray::BrowserMainParts::MainMessageLoopRun(result_code);
 }

 void AtomBrowserMainParts::PreDefaultMainMessageLoopRun(
    base::OnceClosure quit_closure) {
-  Browser::Get()->SetMainMessageLoopQuitClosure(std::move(quit_closure));
+  Browser::SetMainMessageLoopQuitClosure(std::move(quit_closure));
 }

 void AtomBrowserMainParts::PostMainMessageLoopStart() {
-#if defined(USE_X11)
-  // Installs the X11 error handlers for the browser process after the
-  // main message loop has started. This will allow us to exit cleanly
-  // if X exits before us.
-  ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler);
-#endif
-#if defined(OS_LINUX)
-  bluez::DBusBluezManagerWrapperLinux::Initialize();
-#endif
+  brightray::BrowserMainParts::PostMainMessageLoopStart();
 #if defined(OS_POSIX)
  HandleShutdownSignals();
 #endif
 }

 void AtomBrowserMainParts::PostMainMessageLoopRun() {
-#if defined(USE_X11)
-  // Unset the X11 error handlers. The X11 error handlers log the errors using a
-  // |PostTask()| on the message-loop. But since the message-loop is in the
-  // process of terminating, this can cause errors.
-  ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler);
-#endif
+  brightray::BrowserMainParts::PostMainMessageLoopRun();

  js_env_->OnMessageLoopDestroying();

@@ -498,21 +289,6 @@ void AtomBrowserMainParts::PostMainMessageLoopRun() {
      std::move(callback).Run();
    ++iter;
  }
-
-  fake_browser_process_->PostMainMessageLoopRun();
-}
-
-#if !defined(OS_MACOSX)
-void AtomBrowserMainParts::PreMainMessageLoopStart() {
-  PreMainMessageLoopStartCommon();
-}
-#endif
-
-void AtomBrowserMainParts::PreMainMessageLoopStartCommon() {
-#if defined(OS_MACOSX)
-  InitializeMainNib();
-#endif
-  media::SetLocalizedStringProvider(MediaStringProvider);
 }

 device::mojom::GeolocationControl*
--- a/atom/browser/atom_browser_main_parts.h
+++ b/atom/browser/atom_browser_main_parts.h
@@ -11,40 +11,40 @@

 #include "base/callback.h"
 #include "base/timer/timer.h"
+#include "brightray/browser/browser_main_parts.h"
 #include "content/public/browser/browser_context.h"
-#include "content/public/browser/browser_main_parts.h"
 #include "content/public/common/main_function_params.h"
 #include "services/device/public/mojom/geolocation_control.mojom.h"
-#include "ui/views/layout/layout_provider.h"

 class BrowserProcess;
 class IconManager;

-#if defined(USE_AURA)
-namespace wm {
-class WMState;
+#if defined(TOOLKIT_VIEWS)
+namespace brightray {
+class ViewsDelegate;
 }
 #endif

+namespace net_log {
+class ChromeNetLog;
+}
+
 namespace atom {

 class AtomBindings;
 class Browser;
+class IOThread;
 class JavascriptEnvironment;
 class NodeBindings;
 class NodeDebugger;
 class NodeEnvironment;
 class BridgeTaskRunner;

-#if defined(TOOLKIT_VIEWS)
-class ViewsDelegate;
-#endif
-
 #if defined(OS_MACOSX)
 class ViewsDelegateMac;
 #endif

-class AtomBrowserMainParts : public content::BrowserMainParts {
+class AtomBrowserMainParts : public brightray::BrowserMainParts {
 public:
  explicit AtomBrowserMainParts(const content::MainFunctionParams& params);
  ~AtomBrowserMainParts() override;
@@ -70,6 +70,8 @@ class AtomBrowserMainParts : public content::BrowserMainParts {
  IconManager* GetIconManager();

  Browser* browser() { return browser_.get(); }
+  IOThread* io_thread() const { return io_thread_.get(); }
+  net_log::ChromeNetLog* net_log() { return net_log_.get(); }

 protected:
  // content::BrowserMainParts:
@@ -82,14 +84,12 @@ class AtomBrowserMainParts : public content::BrowserMainParts {
  void PreDefaultMainMessageLoopRun(base::OnceClosure quit_closure) override;
  void PostMainMessageLoopStart() override;
  void PostMainMessageLoopRun() override;
+#if defined(OS_MACOSX)
  void PreMainMessageLoopStart() override;
+#endif
  void PostDestroyThreads() override;

 private:
-  void InitializeFeatureList();
-  void OverrideAppLogsPath();
-  void PreMainMessageLoopStartCommon();
-
 #if defined(OS_POSIX)
  // Set signal handlers.
  void HandleSIGCHLD();
@@ -98,23 +98,16 @@ class AtomBrowserMainParts : public content::BrowserMainParts {

 #if defined(OS_MACOSX)
  void FreeAppDelegate();
-  void InitializeMainNib();
 #endif

 #if defined(OS_MACOSX)
  std::unique_ptr<ViewsDelegateMac> views_delegate_;
 #else
-  std::unique_ptr<ViewsDelegate> views_delegate_;
+  std::unique_ptr<brightray::ViewsDelegate> views_delegate_;
 #endif

-#if defined(USE_AURA)
-  std::unique_ptr<wm::WMState> wm_state_;
-#endif
-
-  std::unique_ptr<views::LayoutProvider> layout_provider_;
-
  // A fake BrowserProcess object that used to feed the source code from chrome.
-  std::unique_ptr<BrowserProcessImpl> fake_browser_process_;
+  std::unique_ptr<BrowserProcess> fake_browser_process_;

  // Pointer to exit code.
  int* exit_code_ = nullptr;
@@ -125,6 +118,8 @@ class AtomBrowserMainParts : public content::BrowserMainParts {
  std::unique_ptr<AtomBindings> atom_bindings_;
  std::unique_ptr<NodeEnvironment> node_env_;
  std::unique_ptr<NodeDebugger> node_debugger_;
+  std::unique_ptr<IOThread> io_thread_;
+  std::unique_ptr<net_log::ChromeNetLog> net_log_;
  std::unique_ptr<IconManager> icon_manager_;

  base::RepeatingTimer gc_timer_;
--- a/atom/browser/atom_browser_main_parts_mac.mm
+++ b/atom/browser/atom_browser_main_parts_mac.mm
@@ -4,11 +4,9 @@

 #include "atom/browser/atom_browser_main_parts.h"

-#include "atom/browser/atom_paths.h"
 #include "atom/browser/mac/atom_application_delegate.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
-#include "base/path_service.h"
 #include "ui/base/l10n/l10n_util_mac.h"

 namespace atom {
@@ -18,7 +16,7 @@ void AtomBrowserMainParts::PreMainMessageLoopStart() {
  AtomApplicationDelegate* delegate = [[AtomApplicationDelegate alloc] init];
  [NSApp setDelegate:delegate];

-  PreMainMessageLoopStartCommon();
+  brightray::BrowserMainParts::PreMainMessageLoopStart();

  // Prevent Cocoa from turning command-line arguments into
  // |-application:openFiles:|, since we already handle them directly.
@@ -32,32 +30,4 @@ void AtomBrowserMainParts::FreeAppDelegate() {
  [NSApp setDelegate:nil];
 }

-void AtomBrowserMainParts::OverrideAppLogsPath() {
-  base::FilePath path;
-  NSString* bundleName =
-      [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
-  NSString* logsPath =
-      [NSString stringWithFormat:@"Library/Logs/%@", bundleName];
-  NSString* libraryPath =
-      [NSHomeDirectory() stringByAppendingPathComponent:logsPath];
-
-  base::PathService::Override(DIR_APP_LOGS,
-                              base::FilePath([libraryPath UTF8String]));
-}
-
-// Replicates NSApplicationMain, but doesn't start a run loop.
-void AtomBrowserMainParts::InitializeMainNib() {
-  auto infoDictionary = base::mac::OuterBundle().infoDictionary;
-
-  auto principalClass =
-      NSClassFromString([infoDictionary objectForKey:@"NSPrincipalClass"]);
-  auto application = [principalClass sharedApplication];
-
-  NSString* mainNibName = [infoDictionary objectForKey:@"NSMainNibFile"];
-  auto mainNib = [[NSNib alloc] initWithNibNamed:mainNibName
-                                          bundle:base::mac::FrameworkBundle()];
-  [mainNib instantiateWithOwner:application topLevelObjects:nil];
-  [mainNib release];
-}
-
 }  // namespace atom
--- a/atom/browser/atom_browser_main_parts_posix.cc
+++ b/atom/browser/atom_browser_main_parts_posix.cc
@@ -15,8 +15,6 @@

 #include "atom/browser/browser.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"

 using content::BrowserThread;
@@ -139,7 +137,7 @@ void ShutdownDetector::ThreadMain() {
  base::Closure task =
      base::Bind(&Browser::Quit, base::Unretained(Browser::Get()));

-  if (!base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, task)) {
+  if (!BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, task)) {
    // Without a UI thread to post the exit task to, there aren't many
    // options.  Raise the signal again.  The default handler will pick it up
    // and cause an ungraceful exit.
--- a/atom/browser/atom_download_manager_delegate.cc
+++ b/atom/browser/atom_download_manager_delegate.cc
@@ -14,7 +14,7 @@
 #include "atom/common/options_switches.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
-#include "base/task/post_task.h"
+#include "base/task_scheduler/post_task.h"
 #include "chrome/common/pref_names.h"
 #include "components/download/public/common/download_danger_type.h"
 #include "components/prefs/pref_service.h"
@@ -70,18 +70,6 @@ void AtomDownloadManagerDelegate::GetItemSavePath(download::DownloadItem* item,
    *path = download->GetSavePath();
 }

-void AtomDownloadManagerDelegate::GetItemSaveDialogOptions(
-    download::DownloadItem* item,
-    file_dialog::DialogSettings* options) {
-  v8::Isolate* isolate = v8::Isolate::GetCurrent();
-  v8::Locker locker(isolate);
-  v8::HandleScope handle_scope(isolate);
-  api::DownloadItem* download =
-      api::DownloadItem::FromWrappedClass(isolate, item);
-  if (download)
-    *options = download->GetSaveDialogOptions();
-}
-
 void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
    uint32_t download_id,
    const content::DownloadTargetCallback& callback,
@@ -100,58 +88,19 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
  if (relay)
    window = relay->GetNativeWindow();

-  // Show save dialog if save path was not set already on item
+  auto* web_preferences = WebContentsPreferences::From(web_contents);
+  bool offscreen =
+      !web_preferences || web_preferences->IsEnabled(options::kOffscreen);
+
  base::FilePath path;
  GetItemSavePath(item, &path);
-  if (path.empty()) {
-    file_dialog::DialogSettings settings;
-    GetItemSaveDialogOptions(item, &settings);
-
-    if (!settings.parent_window)
-      settings.parent_window = window;
-    if (settings.title.size() == 0)
-      settings.title = item->GetURL().spec();
-    if (!settings.default_path.empty())
-      settings.default_path = default_path;
-
-    auto* web_preferences = WebContentsPreferences::From(web_contents);
-    const bool offscreen =
-        !web_preferences || web_preferences->IsEnabled(options::kOffscreen);
-    settings.force_detached = offscreen;
-
-    auto dialog_callback =
-        base::Bind(&AtomDownloadManagerDelegate::OnDownloadSaveDialogDone,
-                   base::Unretained(this), download_id, callback);
-    file_dialog::ShowSaveDialog(settings, dialog_callback);
-  } else {
-    callback.Run(path, download::DownloadItem::TARGET_DISPOSITION_PROMPT,
-                 download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path,
-                 download::DOWNLOAD_INTERRUPT_REASON_NONE);
-  }
-}
-
-#if defined(MAS_BUILD)
-void AtomDownloadManagerDelegate::OnDownloadSaveDialogDone(
-    uint32_t download_id,
-    const content::DownloadTargetCallback& download_callback,
-    bool result,
-    const base::FilePath& path,
-    const std::string& bookmark)
-#else
-void AtomDownloadManagerDelegate::OnDownloadSaveDialogDone(
-    uint32_t download_id,
-    const content::DownloadTargetCallback& download_callback,
-    bool result,
-    const base::FilePath& path)
-#endif
-{
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
-  auto* item = download_manager_->GetDownload(download_id);
-  if (!item)
-    return;
-
-  if (result) {
+  // Show save dialog if save path was not set already on item
+  file_dialog::DialogSettings settings;
+  settings.parent_window = window;
+  settings.force_detached = offscreen;
+  settings.title = item->GetURL().spec();
+  settings.default_path = default_path;
+  if (path.empty() && file_dialog::ShowSaveDialog(settings, &path)) {
    // Remember the last selected download directory.
    AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(
        download_manager_->GetBrowserContext());
@@ -168,16 +117,12 @@ void AtomDownloadManagerDelegate::OnDownloadSaveDialogDone(
  }

  // Running the DownloadTargetCallback with an empty FilePath signals that the
-  // download should be cancelled. If user cancels the file save dialog, run
-  // the callback with empty FilePath.
-  const base::FilePath download_path = result ? path : base::FilePath();
-  const auto interrupt_reason =
-      download_path.empty() ? download::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED
-                            : download::DOWNLOAD_INTERRUPT_REASON_NONE;
-  download_callback.Run(download_path,
-                        download::DownloadItem::TARGET_DISPOSITION_PROMPT,
-                        download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-                        download_path, interrupt_reason);
+  // download should be cancelled.
+  // If user cancels the file save dialog, run the callback with empty FilePath.
+  callback.Run(path, download::DownloadItem::TARGET_DISPOSITION_PROMPT,
+               download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, path,
+               path.empty() ? download::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED
+                            : download::DOWNLOAD_INTERRUPT_REASON_NONE);
 }

 void AtomDownloadManagerDelegate::Shutdown() {
@@ -217,7 +162,7 @@ bool AtomDownloadManagerDelegate::DetermineDownloadTarget(

  base::PostTaskWithTraitsAndReplyWithResult(
      FROM_HERE,
-      {base::MayBlock(), base::TaskPriority::BEST_EFFORT,
+      {base::MayBlock(), base::TaskPriority::BACKGROUND,
       base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
      base::BindOnce(&CreateDownloadPath, download->GetURL(),
                     download->GetContentDisposition(),
--- a/atom/browser/atom_download_manager_delegate.h
+++ b/atom/browser/atom_download_manager_delegate.h
@@ -7,7 +7,6 @@

 #include <string>

-#include "atom/browser/ui/file_dialog.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/download_manager_delegate.h"

@@ -25,6 +24,10 @@ class AtomDownloadManagerDelegate : public content::DownloadManagerDelegate {
  explicit AtomDownloadManagerDelegate(content::DownloadManager* manager);
  ~AtomDownloadManagerDelegate() override;

+  void OnDownloadPathGenerated(uint32_t download_id,
+                               const content::DownloadTargetCallback& callback,
+                               const base::FilePath& default_path);
+
  // content::DownloadManagerDelegate:
  void Shutdown() override;
  bool DetermineDownloadTarget(
@@ -38,27 +41,6 @@ class AtomDownloadManagerDelegate : public content::DownloadManagerDelegate {
 private:
  // Get the save path set on the associated api::DownloadItem object
  void GetItemSavePath(download::DownloadItem* item, base::FilePath* path);
-  void GetItemSaveDialogOptions(download::DownloadItem* item,
-                                file_dialog::DialogSettings* settings);
-
-  void OnDownloadPathGenerated(uint32_t download_id,
-                               const content::DownloadTargetCallback& callback,
-                               const base::FilePath& default_path);
-
-#if defined(MAS_BUILD)
-  void OnDownloadSaveDialogDone(
-      uint32_t download_id,
-      const content::DownloadTargetCallback& download_callback,
-      bool result,
-      const base::FilePath& path,
-      const std::string& bookmark);
-#else
-  void OnDownloadSaveDialogDone(
-      uint32_t download_id,
-      const content::DownloadTargetCallback& download_callback,
-      bool result,
-      const base::FilePath& path);
-#endif

  content::DownloadManager* download_manager_;
  base::WeakPtrFactory<AtomDownloadManagerDelegate> weak_ptr_factory_;
--- a/atom/browser/atom_navigation_throttle.cc
+++ b/atom/browser/atom_navigation_throttle.cc
@@ -29,9 +29,9 @@ AtomNavigationThrottle::WillRedirectRequest() {
  }

  auto api_contents =
-      atom::api::WebContents::From(v8::Isolate::GetCurrent(), contents);
+      atom::api::WebContents::CreateFrom(v8::Isolate::GetCurrent(), contents);
  if (api_contents.IsEmpty()) {
-    // No need to emit any event if the WebContents is not available in JS.
+    NOTREACHED();
    return PROCEED;
  }

--- a/atom/browser/atom_permission_manager.cc
+++ b/atom/browser/atom_permission_manager.cc
@@ -222,8 +222,8 @@ blink::mojom::PermissionStatus AtomPermissionManager::GetPermissionStatus(

 int AtomPermissionManager::SubscribePermissionStatusChange(
    content::PermissionType permission,
-    content::RenderFrameHost* render_frame_host,
    const GURL& requesting_origin,
+    const GURL& embedding_origin,
    const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
  return -1;
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Electron Bot	b7f20f1878	Bump v4.0.0-beta.2	2018-10-11 16:27:07 -07:00
trop[bot]	e9e0219ae8	fix: update and enable osr (backport: 4-0-x) (#15084 ) * fix: update and enable osr * fix: update MacHelper view to call GetNativeView * style: move stuff around to make more sense * chore: move OSR related things in SetOwnerWindow to CommonWebContentsDelegate * fix: avoid crashing when GetOffscreenRenderWidgetHostView is called * fix: specify default for current_device_scale_factor_	2018-10-11 10:01:27 -07:00
trop[bot]	24b809f2bc	build: add "apply_patches" flag to gclient (#15082 )	2018-10-11 10:41:11 -05:00
trop[bot]	cfbb22b380	Revert "FIXME: disable isCurrentlyAudible test to unblock merge" (#15083 ) This reverts commit `c8a9a3f63c`.	2018-10-11 10:39:30 -05:00
Electron Bot	f9ae1aa999	Bump v4.0.0-beta.1	2018-10-10 22:01:00 -07:00
Samuel Attard	f1ec2237e7	Revert "Bump v4.0.0-beta.1" This reverts commit `35df516e28`.	2018-10-11 15:54:52 +11:00
Electron Bot	35df516e28	Bump v4.0.0-beta.1	2018-10-10 20:50:05 -07:00