Bump v0.36.12

Run callback of setDestructor immediately when GC happens
Fix #4733.
2026-02-26 03:01:17 -05:00 · 2016-03-27 10:40:57 +09:00 · 2016-03-27 10:40:44 +09:00 · 2016-03-27 10:40:03 +09:00
1114 changed files with 21446 additions and 63546 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,35 +0,0 @@
-# Defines the Chromium style for automatic reformatting.
-# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
-BasedOnStyle: Chromium
-# This defaults to 'Auto'. Explicitly set it for a while, so that
-# 'vector<vector<int> >' in existing files gets formatted to
-# 'vector<vector<int>>'. ('Auto' means that clang-format will only use
-# 'int>>' if the file already contains at least one such instance.)
-Standard: Cpp11
-# Make sure code like:
-# IPC_BEGIN_MESSAGE_MAP()
-#   IPC_MESSAGE_HANDLER(WidgetHostViewHost_Update, OnUpdate)
-# IPC_END_MESSAGE_MAP()
-# gets correctly indented.
-MacroBlockBegin: "^\
-BEGIN_MSG_MAP|\
-BEGIN_MSG_MAP_EX|\
-BEGIN_SAFE_MSG_MAP_EX|\
-CR_BEGIN_MSG_MAP_EX|\
-IPC_BEGIN_MESSAGE_MAP|\
-IPC_BEGIN_MESSAGE_MAP_WITH_PARAM|\
-IPC_PROTOBUF_MESSAGE_TRAITS_BEGIN|\
-IPC_STRUCT_BEGIN|\
-IPC_STRUCT_BEGIN_WITH_PARENT|\
-IPC_STRUCT_TRAITS_BEGIN|\
-POLPARAMS_BEGIN|\
-PPAPI_BEGIN_MESSAGE_MAP$"
-MacroBlockEnd: "^\
-CR_END_MSG_MAP|\
-END_MSG_MAP|\
-IPC_END_MESSAGE_MAP|\
-IPC_PROTOBUF_MESSAGE_TRAITS_END|\
-IPC_STRUCT_END|\
-IPC_STRUCT_TRAITS_END|\
-POLPARAMS_END|\
-PPAPI_END_MESSAGE_MAP$"
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@
 /external_binaries/
 /out/
 /vendor/brightray/vendor/download/
-/vendor/debian_wheezy_amd64-sysroot/
 /vendor/debian_wheezy_arm-sysroot/
 /vendor/debian_wheezy_i386-sysroot/
 /vendor/python_26/
@@ -18,12 +17,5 @@ node_modules/
 *.xcodeproj
 *.swp
 *.pyc
-*.VC.db
-*.VC.VC.opendb
-.vs/
-.vscode/
-*.vcxproj
-*.vcxproj.user
-*.vcxproj.filters
-*.sln
-*.log
+debug.log
+npm-debug.log
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,21 @@
 [submodule "vendor/brightray"]
 	path = vendor/brightray
-	url = https://github.com/electron/brightray.git
+	url = https://github.com/atom/brightray.git
 [submodule "vendor/node"]
 	path = vendor/node
-	url = https://github.com/electron/node.git
+	url = https://github.com/atom/node.git
 [submodule "vendor/depot_tools"]
 	path = vendor/depot_tools
 	url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
 [submodule "vendor/breakpad"]
 	path = vendor/breakpad
-	url = https://github.com/electron/chromium-breakpad.git
+	url = https://github.com/atom/chromium-breakpad.git
 [submodule "vendor/native_mate"]
 	path = vendor/native_mate
 	url = https://github.com/zcbenz/native-mate.git
 [submodule "vendor/crashpad"]
 	path = vendor/crashpad
-	url = https://github.com/electron/crashpad.git
+	url = https://github.com/atom/crashpad.git
 [submodule "vendor/requests"]
 	path = vendor/requests
 	url = https://github.com/kennethreitz/requests
--- a/.node-version
+++ b/.node-version
@@ -1 +0,0 @@
-v6.3.0
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,15 +3,14 @@ git:
 notifications:
  email: false

-language: node_js
-node_js:
-  - "4"
+language: cpp
+compiler: clang
 os:
  - linux
  - osx
 env:
  - TARGET_ARCH=x64
-osx_image: xcode7.3
+osx_image: xcode7

 matrix:
  include:
@@ -20,7 +19,8 @@ matrix:
    - os: linux
      env: TARGET_ARCH=ia32
  allow_failures:
-    - os: osx
+    - env: TARGET_ARCH=arm
+    - env: TARGET_ARCH=ia32

 script: './script/cibuild'

--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,46 +1,24 @@
-# Contributor Covenant Code of Conduct
+# Contributor Code of Conduct

-## Our Pledge
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.

-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.

 Examples of unacceptable behavior by participants include:

-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+- The use of sexualized language or imagery
+- Personal attacks
+- Trolling or insulting/derogatory comments
+- Public or private harassment
+- Publishing other's private information, such as physical or electronic addresses, without explicit permission
+- Other unethical or unprofessional conduct

 Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

-## Scope
+By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.

-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.

-## Enforcement
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at [atom@github.com](mailto:atom@github.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.

-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [electron@github.com](mailto:electron@github.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+This Code of Conduct is adapted from the Contributor Covenant, version 1.3.0, available from http://contributor-covenant.org/version/1/3/0/
--- a/docs-translations/ko-KR/project/CONTRIBUTING.md
+++ b/docs-translations/ko-KR/project/CONTRIBUTING.md
@@ -1,10 +1,10 @@
 # Electron에 기여하기

-:+1::tada: 먼저, 기여에 관심을 가져주셔서 감사합니다! :tada::+1:
+:+1::tada: 먼저, 이 프로젝트에 기여해주셔서 감사합니다! :tada::+1:

-이 프로젝트는 기여자 규약인 [행동강령](CODE_OF_CONDUCT.md)을 준수합니다. 따라서 이
+이 프로젝트는 기여자 규약 [행동강령](CODE_OF_CONDUCT.md)을 준수합니다. 따라서 이
 프로젝트의 개발에 참여하려면 이 규약을 지켜야 합니다. 받아들일 수 없는 행위를 발견했을
-경우 atom@github.com로 보고하세요.
+경우 atom@github.com로 보고 하십시오.

 다음 항목들은 Electron에 기여하는 가이드라인을 제시합니다.
 참고로 이 항목들은 그저 가이드라인에 불과하며 규칙이 아닙니다. 따라서 스스로의 적절한
@@ -12,7 +12,7 @@

 ## 이슈 제출

-* [여기](https://github.com/electron/electron/issues/new)에서 새로운 이슈를 만들 수
+* [여기](https://github.com/atom/electron/issues/new)에서 새로운 이슈를 만들 수
 있습니다. 하지만 이슈를 작성하기 전에 아래의 항목들을 숙지하고 가능한한 이슈 보고에
 대해 최대한 많은 정보와 자세한 설명을 포함해야 합니다. 가능하다면 다음 항목을 포함해야
 합니다:
@@ -23,18 +23,18 @@
 * 추가로 다음 사항을 준수하면 이슈를 해결하는데 큰 도움이 됩니다:
  * 스크린샷 또는 GIF 애니메이션 이미지들
  * 터미널에 출력된 에러의 내용 또는 개발자 도구, 알림창에 뜬 내용
-  * [Cursory search](https://github.com/electron/electron/issues?utf8=✓&q=is%3Aissue+)를
+  * [Cursory search](https://github.com/atom/electron/issues?utf8=✓&q=is%3Aissue+)를
  통해 이미 비슷한 내용의 이슈가 등록되어있는지 확인

 ## Pull Request 하기

 * 가능한한 스크린샷과 GIF 애니메이션 이미지를 pull request에 추가
-* JavaScript, C++과 Python등
-[참조 문서에 정의된 코딩스타일](/docs-translations/ko-KR/development/coding-style.md)을
+* CoffeeScript, JavaScript, C++과 Python등
+[참조문서에 정의된 코딩스타일](/docs-translations/ko-KR/development/coding-style.md)을
 준수
 * [문서 스타일 가이드](/docs-translations/ko-KR/styleguide.md)에 따라 문서를
 [Markdown](https://daringfireball.net/projects/markdown) 형식으로 작성.
-* 짧은, 현재 시제 커밋 메시지 사용. [커밋 메시지 스타일 가이드](#git-커밋-메시지)를
+* 짧은, 현재 시제 커밋 메시지 사용. [커밋 메시지 스타일 가이드](#Git-커밋-메시지)를
 참고하세요

 ## 스타일 가이드
@@ -58,7 +58,7 @@
 ### Git 커밋 메시지

 * 현재 시제 사용 ("Added feature" 대신 "Add feature" 사용)
-* 명령법(imperative mood) 사용 ("Moves cursor to..." 대신 "Move cursor to..." 사용)
+* 필수적 분위기(imperative mood) 사용 ("Moves cursor to..." 대신 "Move cursor to..." 사용)
 * 첫 줄은 72자에 맞추거나 그 보다 적게 제한
 * 자유롭게 필요에 따라 이슈나 PR링크를 참조
 * 단순한 문서 변경일 경우 `[ci skip]`을 커밋 메시지에 추가
@@ -68,13 +68,13 @@
  * :non-potable_water: `:non-potable_water:` 메모리 누수를 연결했을 때
  * :memo: `:memo:` 문서를 작성했을 때
  * :penguin: `:penguin:` Linux에 대한 패치를 했을 때
-  * :apple: `:apple:` macOS에 대한 패치를 했을 때
+  * :apple: `:apple:` Mac OS에 대한 패치를 했을 때
  * :checkered_flag: `:checkered_flag:` Windows에 대한 패치를 했을 때
  * :bug: `:bug:` 버그를 고쳤을 때
  * :fire: `:fire:` 코드 또는 파일을 삭제했을 때
  * :green_heart: `:green_heart:` CI 빌드를 고쳤을 때
  * :white_check_mark: `:white_check_mark:` 테스트를 추가했을 때
  * :lock: `:lock:` 보안 문제를 해결했을 때
-  * :arrow_up: `:arrow_up:` 의존성 라이브러리를 업데이트 했을 때
-  * :arrow_down: `:arrow_down:` 의존성 라이브러리를 다운그레이드 했을 때
+  * :arrow_up: `:arrow_up:` 종속성 라이브러리를 업데이트 했을 때
+  * :arrow_down: `:arrow_down:` 종속성 라이브러리를 다운그레이드 했을 때
  * :shirt: `:shirt:` linter(코드 검사기)의 경고를 제거했을 때
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,5 @@
 # Contributing to Electron

-:memo: Available Translations: [Korean](https://github.com/electron/electron/tree/master/docs-translations/ko-KR/project/CONTRIBUTING.md) | [Simplified Chinese](https://github.com/electron/electron/tree/master/docs-translations/zh-CN/project/CONTRIBUTING.md) | [Brazilian Portuguese](https://github.com/electron/electron/tree/master/docs-translations/pt-BR/project/CONTRIBUTING.md) | [Dutch](https://github.com/electron/electron/tree/master/docs-translations/nl/project/CONTRIBUTING.md)
-
 :+1::tada: First off, thanks for taking the time to contribute! :tada::+1:

 This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md).
@@ -14,7 +12,7 @@ propose changes to this document in a pull request.

 ## Submitting Issues

-* You can create an issue [here](https://github.com/electron/electron/issues/new),
+* You can create an issue [here](https://github.com/atom/electron/issues/new),
 but before doing that please read the notes below and include as many details as
 possible with your report. If you can, please include:
  * The version of Electron you are using
@@ -24,13 +22,13 @@ possible with your report. If you can, please include:
 * Other things that will help resolve your issue:
  * Screenshots and animated GIFs
  * Error output that appears in your terminal, dev tools or as an alert
-  * Perform a [cursory search](https://github.com/electron/electron/issues?utf8=✓&q=is%3Aissue+)
+  * Perform a [cursory search](https://github.com/atom/electron/issues?utf8=✓&q=is%3Aissue+)
  to see if a similar issue has already been submitted

 ## Submitting Pull Requests

 * Include screenshots and animated GIFs in your pull request whenever possible.
-* Follow the JavaScript, C++, and Python [coding style defined in docs](/docs/development/coding-style.md).
+* Follow the CoffeeScript, JavaScript, C++ and Python [coding style defined in docs](/docs/development/coding-style.md).
 * Write documentation in [Markdown](https://daringfireball.net/projects/markdown).
  See the [Documentation Styleguide](/docs/styleguide.md).
 * Use short, present tense commit messages. See [Commit Message Styleguide](#git-commit-messages).
@@ -67,7 +65,7 @@ possible with your report. If you can, please include:
  * :non-potable_water: `:non-potable_water:` when plugging memory leaks
  * :memo: `:memo:` when writing docs
  * :penguin: `:penguin:` when fixing something on Linux
-  * :apple: `:apple:` when fixing something on macOS
+  * :apple: `:apple:` when fixing something on Mac OS
  * :checkered_flag: `:checkered_flag:` when fixing something on Windows
  * :bug: `:bug:` when fixing a bug
  * :fire: `:fire:` when removing code or files
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,23 +1,2 @@
-<!--
-Thanks for opening an issue! A few things to keep in mind:
-
- The issue tracker is only for bugs and feature requests.
- Before reporting a bug, please try reproducing your issue against
-  the latest version of Electron.
- If you need general advice, join our Slack: http://atom-slack.herokuapp.com
-->
-
 * Electron version:
 * Operating system:
-
-### Expected behavior
-
-<!-- What do you think should happen? -->
-
-### Actual behavior
-
-<!-- What actually happens? -->
-
-### How to reproduce
-
-<!-- For bugs, provide sample code or a repo URL that demos the problem -->
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 GitHub Inc.
+Copyright (c) 2014 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-ko.md
+++ b/README-ko.md
@@ -0,0 +1,80 @@
+[![Electron Logo](http://electron.atom.io/images/electron-logo.svg)](http://electron.atom.io/)
+
+[![Build Status](https://travis-ci.org/atom/electron.svg?branch=master)](https://travis-ci.org/atom/electron)
+[![devDependency Status](https://david-dm.org/atom/electron/dev-status.svg)](https://david-dm.org/atom/electron#info=devDependencies)
+[![Join the Electron Community on Slack](http://atom-slack.herokuapp.com/badge.svg)](http://atom-slack.herokuapp.com/)
+
+### [Electron](https://github.com/atom/electron/) 한국어 참조문서
+
+:zap: *프레임워크 이름이 Atom Shell에서 Electron으로 변경되었습니다* :zap:
+
+Electron 프레임워크는 JavaScript, HTML 그리고 CSS를 사용하여
+Cross-Platform 데스크톱 어플리케이션을 개발할 수 있도록 해주는 프레임워크입니다.
+[Node.js](https://nodejs.org/)와 [Chromium](http://www.chromium.org)을 기반으로
+만들어졌으며 [Atom Editor](https://github.com/atom/atom)에 사용되고 있습니다.
+
+Electron에 대한 중요한 알림을 받고 싶다면 Twitter에서
+[@ElectronJS](https://twitter.com/electronjs)를 팔로우 하세요.
+
+이 프로젝트는 기여자 규약 [행동강령](CODE_OF_CONDUCT.md)을 준수합니다. 따라서 이
+프로젝트의 개발에 참여하려면 이 규약을 지켜야 합니다. 받아들일 수 없는 행위를 발견했을
+경우 atom@github.com로 보고 하십시오.
+
+## 다운로드
+
+Linux, Windows, OS X 용으로 미리 빌드된 Electron 바이너리와 디버그 심볼이 준비되어
+있습니다. [releases](https://github.com/atom/electron/releases) 페이지에서 받아 볼
+수 있습니다.
+
+또한 [`npm`](https://docs.npmjs.com/)을 통해 미리 빌드된 Electron 바이너리를 설치할
+수도 있습니다:
+
+```sh
+# $PATH에 `electron` 커맨드를 등록하고 전역에 설치합니다.
+npm install electron-prebuilt -g
+
+# 개발 의존성 모듈 형태로 설치합니다.
+npm install electron-prebuilt --save-dev
+```
+
+### 미러
+
+- [China](https://npm.taobao.org/mirrors/electron)
+
+## 참조 문서
+
+[Docs](https://github.com/atom/electron/tree/master/docs/README.md)에 개발 지침과
+API 레퍼런스가 있습니다. Electron을 빌드 하는 방법과 프로젝트에 기여하는법 또한 문서에
+포함되어 있으니 참고하시기 바랍니다.
+
+## 참조 문서 (번역)
+
+- [브라질 포르투갈어](https://github.com/atom/electron/tree/master/docs-translations/pt-BR)
+- [한국어](https://github.com/atom/electron/tree/master/docs-translations/ko-KR)
+- [일본어](https://github.com/atom/electron/tree/master/docs-translations/jp)
+- [스페인어](https://github.com/atom/electron/tree/master/docs-translations/es)
+- [중국어 간체](https://github.com/atom/electron/tree/master/docs-translations/zh-CN)
+- [중국어 번체](https://github.com/atom/electron/tree/master/docs-translations/zh-TW)
+- [우크라이나어](https://github.com/atom/electron/tree/master/docs-translations/uk-UA)
+- [러시아어](https://github.com/atom/electron/tree/master/docs-translations/ru-RU)
+- [프랑스어](https://github.com/atom/electron/tree/master/docs-translations/fr-FR)
+
+## 시작하기
+
+[`atom/electron-quick-start`](https://github.com/atom/electron-quick-start)
+저장소를 클론하여 Electron을 간단히 접해볼 수 있습니다.
+
+## 커뮤니티
+
+다음 링크를 통해 커뮤니티에 질문을 올리거나 토론을 나눌 수 있습니다:
+
+- Atom 포럼의 [`electron`](http://discuss.atom.io/c/electron) 카테고리
+- Freenode 채팅의 `#atom-shell` 채널
+- Slack의 [`Atom`](http://atom-slack.herokuapp.com/) 채널
+- [`electron-br`](https://electron-br.slack.com) *(브라질)* 커뮤니티
+- [`electron-kr`](http://www.meetup.com/electron-kr/) *(한국)* 커뮤니티
+- [`electron-jp`](https://electron-jp-slackin.herokuapp.com/) *(일본)* 커뮤니티
+
+[awesome-electron](https://github.com/sindresorhus/awesome-electron) 프로젝트에
+커뮤니티가 운영중인 유용한 예제 어플리케이션과 도구, 리소스가 있으니 한번 참고해 보시기
+바랍니다.
--- a/README.md
+++ b/README.md
@@ -1,39 +1,38 @@
 [![Electron Logo](http://electron.atom.io/images/electron-logo.svg)](http://electron.atom.io/)

-[![Travis Build Status](https://travis-ci.org/electron/electron.svg?branch=master)](https://travis-ci.org/electron/electron)
-[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/kvxe4byi7jcxbe26/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/electron)
-[![devDependency Status](https://david-dm.org/electron/electron/dev-status.svg)](https://david-dm.org/electron/electron?type=dev)
+[![Build Status](https://travis-ci.org/atom/electron.svg?branch=master)](https://travis-ci.org/atom/electron)
+[![devDependency Status](https://david-dm.org/atom/electron/dev-status.svg)](https://david-dm.org/atom/electron#info=devDependencies)
 [![Join the Electron Community on Slack](http://atom-slack.herokuapp.com/badge.svg)](http://atom-slack.herokuapp.com/)

-:memo: Available Translations: [Korean](https://github.com/electron/electron/tree/master/docs-translations/ko-KR/project/README.md) | [Simplified Chinese](https://github.com/electron/electron/tree/master/docs-translations/zh-CN/project/README.md) | [Brazilian Portuguese](https://github.com/electron/electron/tree/master/docs-translations/pt-BR/project/README.md) | [Traditional Chinese](https://github.com/electron/electron/tree/master/docs-translations/zh-TW/project/README.md)
+:zap: *Formerly known as Atom Shell* :zap:

 The Electron framework lets you write cross-platform desktop applications
 using JavaScript, HTML and CSS. It is based on [Node.js](https://nodejs.org/) and
-[Chromium](http://www.chromium.org) and is used by the [Atom
-editor](https://github.com/atom/atom) and many other [apps](http://electron.atom.io/apps).
+[Chromium](http://www.chromium.org) and is used in the [Atom
+editor](https://github.com/atom/atom).

 Follow [@ElectronJS](https://twitter.com/electronjs) on Twitter for important
 announcements.

 This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md).
 By participating, you are expected to uphold this code. Please report unacceptable
-behavior to electron@github.com.
+behavior to atom@github.com.

 ## Downloads

-To install prebuilt Electron binaries, use
-[`npm`](https://docs.npmjs.com/) (or [`yarn`](https://yarnpkg.com/en/docs/managing-dependencies)):
+Prebuilt binaries and debug symbols of Electron for Linux, Windows and OS X can
+be found on the [releases](https://github.com/atom/electron/releases) page.
+
+You can also use [`npm`](https://docs.npmjs.com/) to install prebuilt electron
+binaries:

 ```sh
-# Install as a development dependency
-npm install electron --save-dev
-
 # Install the `electron` command globally in your $PATH
-npm install electron -g
-```
+npm install electron-prebuilt -g

-See the [releases page](https://github.com/electron/electron/releases) for
-prebuilt binaries, debug symbols, and more.
+# Install as a development dependency
+npm install electron-prebuilt --save-dev
+```

 ### Mirrors

@@ -42,25 +41,24 @@ prebuilt binaries, debug symbols, and more.
 ## Documentation

 Guides and the API reference are located in the
-[docs](https://github.com/electron/electron/tree/master/docs) directory. It also
+[docs](https://github.com/atom/electron/tree/master/docs) directory. It also
 contains documents describing how to build and contribute to Electron.

 ## Documentation Translations

- [Brazilian Portuguese](https://github.com/electron/electron/tree/master/docs-translations/pt-BR)
- [Korean](https://github.com/electron/electron/tree/master/docs-translations/ko-KR)
- [Japanese](https://github.com/electron/electron/tree/master/docs-translations/jp)
- [Spanish](https://github.com/electron/electron/tree/master/docs-translations/es)
- [Simplified Chinese](https://github.com/electron/electron/tree/master/docs-translations/zh-CN)
- [Traditional Chinese](https://github.com/electron/electron/tree/master/docs-translations/zh-TW)
- [Turkish](https://github.com/electron/electron/tree/master/docs-translations/tr-TR)
- [Ukrainian](https://github.com/electron/electron/tree/master/docs-translations/uk-UA)
- [Russian](https://github.com/electron/electron/tree/master/docs-translations/ru-RU)
- [French](https://github.com/electron/electron/tree/master/docs-translations/fr-FR)
+- [Brazilian Portuguese](https://github.com/atom/electron/tree/master/docs-translations/pt-BR)
+- [Korean](https://github.com/atom/electron/tree/master/docs-translations/ko-KR)
+- [Japanese](https://github.com/atom/electron/tree/master/docs-translations/jp)
+- [Spanish](https://github.com/atom/electron/tree/master/docs-translations/es)
+- [Simplified Chinese](https://github.com/atom/electron/tree/master/docs-translations/zh-CN)
+- [Traditional Chinese](https://github.com/atom/electron/tree/master/docs-translations/zh-TW)
+- [Ukrainian](https://github.com/atom/electron/tree/master/docs-translations/uk-UA)
+- [Russian](https://github.com/atom/electron/tree/master/docs-translations/ru-RU)
+- [French](https://github.com/atom/electron/tree/master/docs-translations/fr-FR)

 ## Quick Start

-Clone and run the [`electron/electron-quick-start`](https://github.com/electron/electron-quick-start)
+Clone and run the [`atom/electron-quick-start`](https://github.com/atom/electron-quick-start)
 repository to see a minimal Electron app in action.

 ## Community
@@ -74,14 +72,6 @@ forums
 - [`electron-br`](https://electron-br.slack.com) *(Brazilian Portuguese)*
 - [`electron-kr`](http://www.meetup.com/electron-kr/) *(Korean)*
 - [`electron-jp`](https://electron-jp-slackin.herokuapp.com/) *(Japanese)*
- [`electron-tr`](http://www.meetup.com/Electron-JS-Istanbul/) *(Turkish)*
- [`electron-id`](https://electron-id.slack.com) *(Indonesia)*

 Check out [awesome-electron](https://github.com/sindresorhus/awesome-electron)
 for a community maintained list of useful example apps, tools and resources.
-
-## License
-
-[MIT](https://github.com/electron/electron/blob/master/LICENSE)
-
-When using the Electron or other GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos).
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,8 +2,6 @@
 # http://www.appveyor.com/docs/appveyor-yml
 version: "{build}"

-os: Visual Studio 2015
-
 init:
  - git config --global core.autocrlf input

@@ -12,7 +10,7 @@ platform:
  - x64

 install:
-  - cmd: SET PATH=C:\Program Files (x86)\MSBuild\14.0\bin\;%PATH%
+  - cmd: SET PATH=C:\Program Files (x86)\MSBuild\12.0\bin\;%PATH%
  - cmd: SET PATH=C:\python27;%PATH%
  - cmd: python script/cibuild

--- a/electron.gyp
+++ b/electron.gyp
@@ -4,8 +4,7 @@
    'product_name%': 'Electron',
    'company_name%': 'GitHub, Inc',
    'company_abbr%': 'github',
-    'version%': '1.4.12',
-    'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
+    'version%': '0.36.12',
  },
  'includes': [
    'filenames.gypi',
@@ -30,7 +29,6 @@
      'type': 'executable',
      'dependencies': [
        'js2asar',
-        'app2asar',
        '<(project_name)_lib',
      ],
      'sources': [
@@ -68,6 +66,12 @@
                '<(PRODUCT_DIR)/<(product_name) Framework.framework',
              ],
            },
+            {
+              'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources',
+              'files': [
+                'default_app',
+              ],
+            },
          ],
          'postbuilds': [
            {
@@ -88,7 +92,7 @@
            },
              # The application doesn't have real localizations, it just has
              # empty .lproj directories, which is enough to convince Cocoa
-              # that Electron supports those languages.
+              # atom-shell supports those languages.
            {
              'postbuild_name': 'Make Empty Localizations',
              'variables': {
@@ -139,6 +143,7 @@
                    ],
                  }, {
                    'copied_libraries': [
+                      '<(libchromiumcontent_dir)/pdf.dll',
                      '<(libchromiumcontent_dir)/ffmpeg.dll',
                    ],
                  }],
@@ -151,17 +156,24 @@
                '<(libchromiumcontent_dir)/libEGL.dll',
                '<(libchromiumcontent_dir)/libGLESv2.dll',
                '<(libchromiumcontent_dir)/icudtl.dat',
-                '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak',
                '<(libchromiumcontent_dir)/content_resources_200_percent.pak',
                '<(libchromiumcontent_dir)/content_shell.pak',
                '<(libchromiumcontent_dir)/ui_resources_200_percent.pak',
-                '<(libchromiumcontent_dir)/views_resources_200_percent.pak',
                '<(libchromiumcontent_dir)/natives_blob.bin',
                '<(libchromiumcontent_dir)/snapshot_blob.bin',
                'external_binaries/d3dcompiler_47.dll',
                'external_binaries/xinput1_3.dll',
+                'external_binaries/msvcp120.dll',
+                'external_binaries/msvcr120.dll',
+                'external_binaries/vccorlib120.dll',
              ],
            },
+            {
+              'destination': '<(PRODUCT_DIR)/resources',
+              'files': [
+                'default_app',
+              ]
+            },
          ],
        }, {
          'dependencies': [
@@ -192,15 +204,17 @@
                '<@(copied_libraries)',
                '<(libchromiumcontent_dir)/locales',
                '<(libchromiumcontent_dir)/icudtl.dat',
-                '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak',
-                '<(libchromiumcontent_dir)/content_resources_200_percent.pak',
                '<(libchromiumcontent_dir)/content_shell.pak',
-                '<(libchromiumcontent_dir)/ui_resources_200_percent.pak',
-                '<(libchromiumcontent_dir)/views_resources_200_percent.pak',
                '<(libchromiumcontent_dir)/natives_blob.bin',
                '<(libchromiumcontent_dir)/snapshot_blob.bin',
              ],
            },
+            {
+              'destination': '<(PRODUCT_DIR)/resources',
+              'files': [
+                'default_app',
+              ]
+            },
          ],
        }],  # OS=="linux"
      ],
@@ -214,9 +228,6 @@
        'vendor/node/node.gyp:node',
      ],
      'defines': [
-        # We need to access internal implementations of Node.
-        'NODE_WANT_INTERNALS=1',
-        'NODE_SHARED_MODE',
        # This is defined in skia/skia_common.gypi.
        'SK_SUPPORT_LEGACY_GETTOPDEVICE',
        # Disable warnings for g_settings_list_schemas.
@@ -280,8 +291,6 @@
              '-lcomdlg32.lib',
              '-lwininet.lib',
              '-lwinmm.lib',
-              '-lcrypt32.lib',
-              '-luiautomationcore.lib',
            ],
          },
          'dependencies': [
@@ -307,10 +316,6 @@
              '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
            ],
          },
-          'xcode_settings': {
-            # ReactiveCocoa which is used by Squirrel requires using __weak.
-            'CLANG_ENABLE_OBJC_WEAK': 'YES',
-          },
        }],  # OS=="mac" and mas_build==0
        ['OS=="mac" and mas_build==1', {
          'defines': [
@@ -323,9 +328,6 @@
          ],
        }],  # OS=="mac" and mas_build==1
        ['OS=="linux"', {
-          'sources': [
-            '<@(lib_sources_nss)',
-          ],
          'link_settings': {
            'ldflags': [
              # Make binary search for libraries under current directory, so we
@@ -369,104 +371,25 @@
            '<@(js_sources)',
          ],
          'outputs': [
-            '<(resources_path)/electron.asar',
+            '<(resources_path)/atom.asar',
          ],
          'action': [
            'python',
            'tools/js2asar.py',
            '<@(_outputs)',
-            'lib',
            '<@(_inputs)',
          ],
        }
      ],
    },  # target js2asar
-    {
-      'target_name': 'app2asar',
-      'type': 'none',
-      'actions': [
-        {
-          'action_name': 'app2asar',
-          'variables': {
-            'conditions': [
-              ['OS=="mac"', {
-                'resources_path': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources',
-              },{
-                'resources_path': '<(PRODUCT_DIR)/resources',
-              }],
-            ],
-          },
-          'inputs': [
-            '<@(default_app_sources)',
-          ],
-          'outputs': [
-            '<(resources_path)/default_app.asar',
-          ],
-          'action': [
-            'python',
-            'tools/js2asar.py',
-            '<@(_outputs)',
-            'default_app',
-            '<@(_inputs)',
-          ],
-        }
-      ],
-    },  # target app2asar
-    {
-      'target_name': 'atom_js2c_copy',
-      'type': 'none',
-      'copies': [
-        {
-          'destination': '<(js2c_input_dir)',
-          'files': [
-            '<@(js2c_sources)',
-          ],
-        },
-      ],
-    },  # target atom_js2c_copy
-    {
-      'target_name': 'atom_browserify',
-      'type': 'none',
-      'dependencies': [
-        # depend on this target to ensure the '<(js2c_input_dir)' is created
-        'atom_js2c_copy',
-      ],
-      'actions': [
-        {
-          'action_name': 'atom_browserify',
-          'inputs': [
-            '<@(browserify_entries)',
-          ],
-          'outputs': [
-            '<(js2c_input_dir)/preload_bundle.js',
-          ],
-          'action': [
-            'npm',
-            'run',
-            '--silent',
-            'browserify',
-            '--',
-            'lib/sandboxed_renderer/init.js',
-            '-o',
-            '<@(_outputs)',
-          ],
-        }
-      ],
-    },  # target atom_browserify
    {
      'target_name': 'atom_js2c',
      'type': 'none',
-      'dependencies': [
-        'atom_js2c_copy',
-        'atom_browserify',
-      ],
      'actions': [
        {
          'action_name': 'atom_js2c',
          'inputs': [
-            # List all input files that should trigger a rebuild with js2c
            '<@(js2c_sources)',
-            '<(js2c_input_dir)/preload_bundle.js',
          ],
          'outputs': [
            '<(SHARED_INTERMEDIATE_DIR)/atom_natives.h',
@@ -475,7 +398,7 @@
            'python',
            'tools/js2c.py',
            '<@(_outputs)',
-            '<(js2c_input_dir)',
+            '<@(_inputs)',
          ],
        }
      ],
@@ -506,7 +429,6 @@
            'libraries': [
              '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
              '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
-              '$(SDKROOT)/System/Library/Frameworks/Quartz.framework',
            ],
          },
          'mac_bundle': 1,
@@ -568,7 +490,7 @@
              'action': [
                'install_name_tool',
                '-change',
-                '/usr/local/lib/libffmpeg.dylib',
+                '@loader_path/libffmpeg.dylib',
                '@rpath/libffmpeg.dylib',
                '${BUILT_PRODUCTS_DIR}/<(product_name) Framework.framework/Versions/A/<(product_name) Framework',
              ],
--- a/atom/CPPLINT.cfg
+++ b/atom/CPPLINT.cfg
@@ -1 +0,0 @@
-filter=+build/include_alpha
--- a/atom/app/atom_content_client.cc
+++ b/atom/app/atom_content_client.cc
@@ -89,9 +89,11 @@ content::PepperPluginInfo CreateWidevineCdmInfo(const base::FilePath& path,

  // Add the supported codecs as if they came from the component manifest.
  std::vector<std::string> codecs;
+  codecs.push_back(kCdmSupportedCodecVorbis);
  codecs.push_back(kCdmSupportedCodecVp8);
  codecs.push_back(kCdmSupportedCodecVp9);
 #if defined(USE_PROPRIETARY_CODECS)
+  codecs.push_back(kCdmSupportedCodecAac);
  codecs.push_back(kCdmSupportedCodecAvc1);
 #endif  // defined(USE_PROPRIETARY_CODECS)
  std::string codec_string = base::JoinString(
@@ -124,7 +126,7 @@ void ConvertStringWithSeparatorToVector(std::vector<std::string>* vec,
 void AddPepperFlashFromCommandLine(
    std::vector<content::PepperPluginInfo>* plugins) {
  auto command_line = base::CommandLine::ForCurrentProcess();
-  base::FilePath flash_path = command_line->GetSwitchValuePath(
+  auto flash_path = command_line->GetSwitchValueNative(
      switches::kPpapiFlashPath);
  if (flash_path.empty())
    return;
@@ -132,19 +134,20 @@ void AddPepperFlashFromCommandLine(
  auto flash_version = command_line->GetSwitchValueASCII(
      switches::kPpapiFlashVersion);

-  plugins->push_back(CreatePepperFlashInfo(flash_path, flash_version));
+  plugins->push_back(
+      CreatePepperFlashInfo(base::FilePath(flash_path), flash_version));
 }

 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
 void AddWidevineCdmFromCommandLine(
    std::vector<content::PepperPluginInfo>* plugins) {
  auto command_line = base::CommandLine::ForCurrentProcess();
-  base::FilePath widevine_cdm_path = command_line->GetSwitchValuePath(
+  auto widevine_cdm_path = command_line->GetSwitchValueNative(
      switches::kWidevineCdmPath);
  if (widevine_cdm_path.empty())
    return;

-  if (!base::PathExists(widevine_cdm_path))
+  if (!base::PathExists(base::FilePath(widevine_cdm_path)))
    return;

  auto widevine_cdm_version = command_line->GetSwitchValueASCII(
@@ -152,7 +155,7 @@ void AddWidevineCdmFromCommandLine(
  if (widevine_cdm_version.empty())
    return;

-  plugins->push_back(CreateWidevineCdmInfo(widevine_cdm_path,
+  plugins->push_back(CreateWidevineCdmInfo(base::FilePath(widevine_cdm_path),
                                           widevine_cdm_version));
 }
 #endif
@@ -179,8 +182,14 @@ base::string16 AtomContentClient::GetLocalizedString(int message_id) const {

 void AtomContentClient::AddAdditionalSchemes(
    std::vector<url::SchemeWithType>* standard_schemes,
-    std::vector<url::SchemeWithType>* referrer_schemes,
    std::vector<std::string>* savable_schemes) {
+  std::vector<std::string> schemes;
+  ConvertStringWithSeparatorToVector(&schemes, ",",
+                                     switches::kRegisterStandardSchemes);
+  if (!schemes.empty()) {
+    for (const std::string& scheme : schemes)
+      standard_schemes->push_back({scheme.c_str(), url::SCHEME_WITHOUT_PORT});
+  }
  standard_schemes->push_back({"chrome-extension", url::SCHEME_WITHOUT_PORT});
 }

--- a/atom/app/atom_content_client.h
+++ b/atom/app/atom_content_client.h
@@ -25,7 +25,6 @@ class AtomContentClient : public brightray::ContentClient {
  base::string16 GetLocalizedString(int message_id) const override;
  void AddAdditionalSchemes(
      std::vector<url::SchemeWithType>* standard_schemes,
-      std::vector<url::SchemeWithType>* referrer_schemes,
      std::vector<std::string>* savable_schemes) override;
  void AddPepperPlugins(
      std::vector<content::PepperPluginInfo>* plugins) override;
--- a/atom/app/atom_library_main.h
+++ b/atom/app/atom_library_main.h
@@ -5,7 +5,7 @@
 #ifndef ATOM_APP_ATOM_LIBRARY_MAIN_H_
 #define ATOM_APP_ATOM_LIBRARY_MAIN_H_

-#include "build/build_config.h"
+#include "base/basictypes.h"

 #if defined(OS_MACOSX)
 extern "C" {
--- a/atom/app/atom_main.cc
+++ b/atom/app/atom_main.cc
@@ -7,19 +7,18 @@
 #include <stdlib.h>

 #if defined(OS_WIN)
-#include <windows.h>  // windows.h must be included first
-
-#include <shellapi.h>
+#include <windows.h>
 #include <shellscalingapi.h>
 #include <tchar.h>
+#include <shellapi.h>

 #include "atom/app/atom_main_delegate.h"
 #include "atom/common/crash_reporter/win/crash_service_main.h"
 #include "base/environment.h"
-#include "base/process/launch.h"
 #include "base/win/windows_version.h"
-#include "content/public/app/sandbox_helper_win.h"
+#include "content/public/app/startup_helper_win.h"
 #include "sandbox/win/src/sandbox_types.h"
+#include "ui/gfx/win/dpi.h"
 #elif defined(OS_LINUX)  // defined(OS_WIN)
 #include "atom/app/atom_main_delegate.h"  // NOLINT
 #include "content/public/app/content_main.h"
@@ -35,6 +34,7 @@
 namespace {

 const char* kRunAsNode = "ELECTRON_RUN_AS_NODE";
+const char* kOldRunAsNode = "ATOM_SHELL_INTERNAL_RUN_AS_NODE";

 bool IsEnvSet(const char* name) {
 #if defined(OS_WIN)
@@ -47,6 +47,50 @@ bool IsEnvSet(const char* name) {
 #endif
 }

+bool IsRunAsNode() {
+  return IsEnvSet(kRunAsNode) || IsEnvSet(kOldRunAsNode);
+}
+
+#if defined(OS_WIN)
+// Win8.1 supports monitor-specific DPI scaling.
+bool SetProcessDpiAwarenessWrapper(PROCESS_DPI_AWARENESS value) {
+  typedef HRESULT(WINAPI *SetProcessDpiAwarenessPtr)(PROCESS_DPI_AWARENESS);
+  SetProcessDpiAwarenessPtr set_process_dpi_awareness_func =
+      reinterpret_cast<SetProcessDpiAwarenessPtr>(
+          GetProcAddress(GetModuleHandleA("user32.dll"),
+                         "SetProcessDpiAwarenessInternal"));
+  if (set_process_dpi_awareness_func) {
+    HRESULT hr = set_process_dpi_awareness_func(value);
+    if (SUCCEEDED(hr)) {
+      VLOG(1) << "SetProcessDpiAwareness succeeded.";
+      return true;
+    } else if (hr == E_ACCESSDENIED) {
+      LOG(ERROR) << "Access denied error from SetProcessDpiAwareness. "
+          "Function called twice, or manifest was used.";
+    }
+  }
+  return false;
+}
+
+// This function works for Windows Vista through Win8. Win8.1 must use
+// SetProcessDpiAwareness[Wrapper].
+BOOL SetProcessDPIAwareWrapper() {
+  typedef BOOL(WINAPI *SetProcessDPIAwarePtr)(VOID);
+  SetProcessDPIAwarePtr set_process_dpi_aware_func =
+      reinterpret_cast<SetProcessDPIAwarePtr>(
+      GetProcAddress(GetModuleHandleA("user32.dll"),
+                      "SetProcessDPIAware"));
+  return set_process_dpi_aware_func &&
+    set_process_dpi_aware_func();
+}
+
+void EnableHighDPISupport() {
+  if (!SetProcessDpiAwarenessWrapper(PROCESS_SYSTEM_DPI_AWARE)) {
+    SetProcessDPIAwareWrapper();
+  }
+}
+#endif
+
 }  // namespace

 #if defined(OS_WIN)
@@ -54,11 +98,14 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
  int argc = 0;
  wchar_t** wargv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);

-  bool run_as_node = IsEnvSet(kRunAsNode);
+  // Make output work in console if we are not in cygiwn.
+  if (!IsEnvSet("TERM") && !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE")) {
+    AttachConsole(ATTACH_PARENT_PROCESS);

-  // Make sure the output is printed to console.
-  if (run_as_node || !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE"))
-    base::RouteStdioToConsole(false);
+    FILE* dontcare;
+    freopen_s(&dontcare, "CON", "w", stdout);
+    freopen_s(&dontcare, "CON", "w", stderr);
+  }

  // Convert argv to to UTF8
  char** argv = new char*[argc];
@@ -94,12 +141,12 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
    }
  }

-  if (run_as_node) {
+  if (IsRunAsNode()) {
    // Now that argv conversion is done, we can finally start.
    base::AtExitManager atexit_manager;
    base::i18n::InitializeICU();
    return atom::NodeMain(argc, argv);
-  } else if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
+  } else if (IsEnvSet("ATOM_SHELL_INTERNAL_CRASH_SERVICE")) {
    return crash_service::Main(cmd);
  }

@@ -107,18 +154,23 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
  content::InitializeSandboxInfo(&sandbox_info);
  atom::AtomMainDelegate delegate;

+  // We don't want to set DPI awareness on pre-Win7 because we don't support
+  // DirectWrite there. GDI fonts are kerned very badly, so better to leave
+  // DPI-unaware and at effective 1.0. See also ShouldUseDirectWrite().
+  if (base::win::GetVersion() >= base::win::VERSION_WIN7)
+    EnableHighDPISupport();
+
  content::ContentMainParams params(&delegate);
  params.instance = instance;
  params.sandbox_info = &sandbox_info;
  atom::AtomCommandLine::Init(argc, argv);
-  atom::AtomCommandLine::InitW(argc, wargv);
  return content::ContentMain(params);
 }

 #elif defined(OS_LINUX)  // defined(OS_WIN)

 int main(int argc, const char* argv[]) {
-  if (IsEnvSet(kRunAsNode)) {
+  if (IsRunAsNode()) {
    base::i18n::InitializeICU();
    base::AtExitManager atexit_manager;
    return atom::NodeMain(argc, const_cast<char**>(argv));
@@ -135,7 +187,7 @@ int main(int argc, const char* argv[]) {
 #else  // defined(OS_LINUX)

 int main(int argc, const char* argv[]) {
-  if (IsEnvSet(kRunAsNode)) {
+  if (IsRunAsNode()) {
    return AtomInitializeICUandStartNode(argc, const_cast<char**>(argv));
  }

--- a/atom/app/atom_main_delegate.cc
+++ b/atom/app/atom_main_delegate.cc
@@ -4,16 +4,13 @@

 #include "atom/app/atom_main_delegate.h"

-#include <iostream>
 #include <string>
+#include <iostream>

 #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"
 #include "atom/utility/atom_content_utility_client.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
@@ -28,20 +25,11 @@ namespace atom {

 namespace {

-const char* kRelauncherProcess = "relauncher";
-
 bool IsBrowserProcess(base::CommandLine* cmd) {
-  std::string process_type = cmd->GetSwitchValueASCII(::switches::kProcessType);
+  std::string process_type = cmd->GetSwitchValueASCII(switches::kProcessType);
  return process_type.empty();
 }

-#if defined(OS_WIN)
-void InvalidParameterHandler(const wchar_t*, const wchar_t*, const wchar_t*,
-                             unsigned int, uintptr_t) {
-  // noop.
-}
-#endif
-
 }  // namespace

 AtomMainDelegate::AtomMainDelegate() {
@@ -73,8 +61,8 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
 #endif  // !defined(OS_WIN)

  // Only enable logging when --enable-logging is specified.
-  std::unique_ptr<base::Environment> env(base::Environment::Create());
-  if (!command_line->HasSwitch(::switches::kEnableLogging) &&
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  if (!command_line->HasSwitch(switches::kEnableLogging) &&
      !env->HasVar("ELECTRON_ENABLE_LOGGING")) {
    settings.logging_dest = logging::LOG_NONE;
    logging::SetMinLogLevel(logging::LOG_NUM_SEVERITIES);
@@ -95,15 +83,6 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {

  chrome::RegisterPathProvider();

-#if defined(OS_MACOSX)
-  SetUpBundleOverrides();
-#endif
-
-#if defined(OS_WIN)
-  // Ignore invalid parameter errors.
-  _set_invalid_parameter_handler(InvalidParameterHandler);
-#endif
-
  return brightray::MainDelegate::BasicStartupComplete(exit_code);
 }

@@ -111,29 +90,27 @@ void AtomMainDelegate::PreSandboxStartup() {
  brightray::MainDelegate::PreSandboxStartup();

  // Set google API key.
-  std::unique_ptr<base::Environment> env(base::Environment::Create());
+  scoped_ptr<base::Environment> env(base::Environment::Create());
  if (!env->HasVar("GOOGLE_API_KEY"))
    env->SetVar("GOOGLE_API_KEY", GOOGLEAPIS_API_KEY);

  auto command_line = base::CommandLine::ForCurrentProcess();
  std::string process_type = command_line->GetSwitchValueASCII(
-      ::switches::kProcessType);
+      switches::kProcessType);
+
+  if (process_type == switches::kUtilityProcess) {
+    AtomContentUtilityClient::PreSandboxStartup();
+  }

  // Only append arguments for browser process.
  if (!IsBrowserProcess(command_line))
    return;

-  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(::switches::kDisableSetuidSandbox);
-  } else {
-    // Disable renderer sandbox for most of node's functions.
-    command_line->AppendSwitch(::switches::kNoSandbox);
-  }
+  // Disable renderer sandbox for most of node's functions.
+  command_line->AppendSwitch(switches::kNoSandbox);

  // Allow file:// URIs to read other file:// URIs by default.
-  command_line->AppendSwitch(::switches::kAllowFileAccessFromFiles);
+  command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);

 #if defined(OS_MACOSX)
  // Enable AVFoundation.
@@ -148,13 +125,7 @@ content::ContentBrowserClient* AtomMainDelegate::CreateContentBrowserClient() {

 content::ContentRendererClient*
    AtomMainDelegate::CreateContentRendererClient() {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableSandbox)) {
-    renderer_client_.reset(new AtomSandboxedRendererClient);
-  } else {
-    renderer_client_.reset(new AtomRendererClient);
-  }
-
+  renderer_client_.reset(new AtomRendererClient);
  return renderer_client_.get();
 }

@@ -163,29 +134,8 @@ content::ContentUtilityClient* AtomMainDelegate::CreateContentUtilityClient() {
  return utility_client_.get();
 }

-int AtomMainDelegate::RunProcess(
-    const std::string& process_type,
-    const content::MainFunctionParams& main_function_params) {
-  if (process_type == kRelauncherProcess)
-    return relauncher::RelauncherMain(main_function_params);
-  else
-    return -1;
-}
-
-#if defined(OS_MACOSX)
-bool AtomMainDelegate::ShouldSendMachPort(const std::string& process_type) {
-  return process_type != kRelauncherProcess;
-}
-
-bool AtomMainDelegate::DelaySandboxInitialization(
-    const std::string& process_type) {
-  return process_type == kRelauncherProcess;
-}
-#endif
-
-std::unique_ptr<brightray::ContentClient>
-AtomMainDelegate::CreateContentClient() {
-  return std::unique_ptr<brightray::ContentClient>(new AtomContentClient);
+scoped_ptr<brightray::ContentClient> AtomMainDelegate::CreateContentClient() {
+  return scoped_ptr<brightray::ContentClient>(new AtomContentClient).Pass();
 }

 }  // namespace atom
--- a/atom/app/atom_main_delegate.h
+++ b/atom/app/atom_main_delegate.h
@@ -5,10 +5,8 @@
 #ifndef ATOM_APP_ATOM_MAIN_DELEGATE_H_
 #define ATOM_APP_ATOM_MAIN_DELEGATE_H_

-#include <string>
-
-#include "brightray/common/content_client.h"
 #include "brightray/common/main_delegate.h"
+#include "brightray/common/content_client.h"

 namespace atom {

@@ -24,30 +22,19 @@ class AtomMainDelegate : public brightray::MainDelegate {
  content::ContentBrowserClient* CreateContentBrowserClient() override;
  content::ContentRendererClient* CreateContentRendererClient() override;
  content::ContentUtilityClient* CreateContentUtilityClient() override;
-  int RunProcess(
-      const std::string& process_type,
-      const content::MainFunctionParams& main_function_params) override;
-#if defined(OS_MACOSX)
-  bool ShouldSendMachPort(const std::string& process_type) override;
-  bool DelaySandboxInitialization(const std::string& process_type) override;
-#endif

  // brightray::MainDelegate:
-  std::unique_ptr<brightray::ContentClient> CreateContentClient() override;
+  scoped_ptr<brightray::ContentClient> CreateContentClient() override;
 #if defined(OS_MACOSX)
  void OverrideChildProcessPath() override;
  void OverrideFrameworkBundlePath() override;
 #endif

 private:
-#if defined(OS_MACOSX)
-  void SetUpBundleOverrides();
-#endif
-
  brightray::ContentClient content_client_;
-  std::unique_ptr<content::ContentBrowserClient> browser_client_;
-  std::unique_ptr<content::ContentRendererClient> renderer_client_;
-  std::unique_ptr<content::ContentUtilityClient> utility_client_;
+  scoped_ptr<content::ContentBrowserClient> browser_client_;
+  scoped_ptr<content::ContentRendererClient> renderer_client_;
+  scoped_ptr<content::ContentUtilityClient> utility_client_;

  DISALLOW_COPY_AND_ASSIGN(AtomMainDelegate);
 };
--- a/atom/app/atom_main_delegate_mac.mm
+++ b/atom/app/atom_main_delegate_mac.mm
@@ -7,10 +7,7 @@
 #include "base/mac/bundle_locations.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
-#include "base/mac/foundation_util.h"
-#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"
@@ -51,15 +48,4 @@ void AtomMainDelegate::OverrideChildProcessPath() {
  PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
 }

-void AtomMainDelegate::SetUpBundleOverrides() {
-  base::mac::ScopedNSAutoreleasePool pool;
-  NSBundle* bundle = brightray::MainApplicationBundle();
-  std::string base_bundle_id =
-      base::SysNSStringToUTF8([bundle bundleIdentifier]);
-  NSString* team_id = [bundle objectForInfoDictionaryKey:@"ElectronTeamID"];
-  if (team_id)
-    base_bundle_id = base::SysNSStringToUTF8(team_id) + "." + base_bundle_id;
-  base::mac::SetBaseBundleID(base_bundle_id.c_str());
-}
-
 }  // namespace atom
--- a/atom/app/node_main.cc
+++ b/atom/app/node_main.cc
@@ -8,20 +8,12 @@
 #include "atom/browser/javascript_environment.h"
 #include "atom/browser/node_debugger.h"
 #include "base/command_line.h"
-#include "base/feature_list.h"
-#include "base/threading/thread_task_runner_handle.h"
+#include "atom/common/node_includes.h"
+#include "base/thread_task_runner_handle.h"
 #include "gin/array_buffer.h"
 #include "gin/public/isolate_holder.h"
 #include "gin/v8_initializer.h"

-#if defined(OS_WIN)
-#include "atom/common/api/atom_bindings.h"
-#include "atom/common/native_mate_converters/string16_converter.h"
-#include "native_mate/dictionary.h"
-#endif
-
-#include "atom/common/node_includes.h"
-
 namespace atom {

 int NodeMain(int argc, char *argv[]) {
@@ -35,11 +27,6 @@ int NodeMain(int argc, char *argv[]) {
    scoped_refptr<UvTaskRunner> uv_task_runner(new UvTaskRunner(loop));
    base::ThreadTaskRunnerHandle handle(uv_task_runner);

-    // Initialize feature list.
-    std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
-    feature_list->InitializeFromCommandLine("", "");
-    base::FeatureList::SetInstance(std::move(feature_list));
-
    gin::V8Initializer::LoadV8Snapshot();
    gin::V8Initializer::LoadV8Natives();
    JavascriptEnvironment gin_env;
@@ -57,11 +44,6 @@ int NodeMain(int argc, char *argv[]) {
    if (node_debugger.IsRunning())
      env->AssignToContext(v8::Debug::GetDebugContext());

-#if defined(OS_WIN)
-    mate::Dictionary process(gin_env.isolate(), env->process_object());
-    process.SetMethod("log", &AtomBindings::Log);
-#endif
-
    node::LoadEnvironment(env);

    bool more;
@@ -81,7 +63,7 @@ int NodeMain(int argc, char *argv[]) {
    exit_code = node::EmitExit(env);
    node::RunAtExit(env);

-    node::FreeEnvironment(env);
+    env->Dispose();
  }

  v8::V8::Dispose();
--- a/atom/app/uv_task_runner.cc
+++ b/atom/app/uv_task_runner.cc
@@ -21,7 +21,7 @@ UvTaskRunner::~UvTaskRunner() {
 bool UvTaskRunner::PostDelayedTask(const tracked_objects::Location& from_here,
                                   const base::Closure& task,
                                   base::TimeDelta delay) {
-  auto* timer = new uv_timer_t;
+  uv_timer_t* timer = new uv_timer_t;
  timer->data = this;
  uv_timer_init(loop_, timer);
  uv_timer_start(timer, UvTaskRunner::OnTimeout, delay.InMilliseconds(), 0);
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -14,30 +14,23 @@
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/browser.h"
 #include "atom/browser/login_handler.h"
-#include "atom/browser/relauncher.h"
-#include "atom/common/atom_command_line.h"
 #include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/native_mate_converters/net_converter.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/native_mate_converters/image_converter.h"
-#include "atom/common/native_mate_converters/net_converter.h"
-#include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/node_includes.h"
 #include "atom/common/options_switches.h"
 #include "base/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/strings/string_util.h"
 #include "brightray/browser/brightray_paths.h"
 #include "chrome/common/chrome_paths.h"
-#include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/common/content_switches.h"
-#include "media/audio/audio_manager.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 #include "net/ssl/ssl_cert_request_info.h"
@@ -45,8 +38,8 @@
 #include "ui/gfx/image/image.h"

 #if defined(OS_WIN)
-#include "atom/browser/ui/win/jump_list.h"
 #include "base/strings/utf_string_conversions.h"
+#include "ui/base/win/shell.h"
 #endif

 using atom::Browser;
@@ -72,246 +65,8 @@ struct Converter<Browser::UserTask> {
    return true;
  }
 };
-
-using atom::JumpListItem;
-using atom::JumpListCategory;
-using atom::JumpListResult;
-
-template<>
-struct Converter<JumpListItem::Type> {
-  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-                     JumpListItem::Type* out) {
-    std::string item_type;
-    if (!ConvertFromV8(isolate, val, &item_type))
-      return false;
-
-    if (item_type == "task")
-      *out = JumpListItem::Type::TASK;
-    else if (item_type == "separator")
-      *out = JumpListItem::Type::SEPARATOR;
-    else if (item_type == "file")
-      *out = JumpListItem::Type::FILE;
-    else
-      return false;
-
-    return true;
-  }
-
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   JumpListItem::Type val) {
-    std::string item_type;
-    switch (val) {
-      case JumpListItem::Type::TASK:
-        item_type = "task";
-        break;
-
-      case JumpListItem::Type::SEPARATOR:
-        item_type = "separator";
-        break;
-
-      case JumpListItem::Type::FILE:
-        item_type = "file";
-        break;
-    }
-    return mate::ConvertToV8(isolate, item_type);
-  }
-};
-
-template<>
-struct Converter<JumpListItem> {
-  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-                     JumpListItem* out) {
-    mate::Dictionary dict;
-    if (!ConvertFromV8(isolate, val, &dict))
-      return false;
-
-    if (!dict.Get("type", &(out->type)))
-      return false;
-
-    switch (out->type) {
-      case JumpListItem::Type::TASK:
-        if (!dict.Get("program", &(out->path)) ||
-            !dict.Get("title", &(out->title)))
-          return false;
-
-        if (dict.Get("iconPath", &(out->icon_path)) &&
-            !dict.Get("iconIndex", &(out->icon_index)))
-          return false;
-
-        dict.Get("args", &(out->arguments));
-        dict.Get("description", &(out->description));
-        return true;
-
-      case JumpListItem::Type::SEPARATOR:
-        return true;
-
-      case JumpListItem::Type::FILE:
-        return dict.Get("path", &(out->path));
-    }
-
-    assert(false);
-    return false;
-  }
-
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const JumpListItem& val) {
-    mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-    dict.Set("type", val.type);
-
-    switch (val.type) {
-      case JumpListItem::Type::TASK:
-        dict.Set("program", val.path);
-        dict.Set("args", val.arguments);
-        dict.Set("title", val.title);
-        dict.Set("iconPath", val.icon_path);
-        dict.Set("iconIndex", val.icon_index);
-        dict.Set("description", val.description);
-        break;
-
-      case JumpListItem::Type::SEPARATOR:
-        break;
-
-      case JumpListItem::Type::FILE:
-        dict.Set("path", val.path);
-        break;
-    }
-    return dict.GetHandle();
-  }
-};
-
-template<>
-struct Converter<JumpListCategory::Type> {
-  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-                     JumpListCategory::Type* out) {
-    std::string category_type;
-    if (!ConvertFromV8(isolate, val, &category_type))
-      return false;
-
-    if (category_type == "tasks")
-      *out = JumpListCategory::Type::TASKS;
-    else if (category_type == "frequent")
-      *out = JumpListCategory::Type::FREQUENT;
-    else if (category_type == "recent")
-      *out = JumpListCategory::Type::RECENT;
-    else if (category_type == "custom")
-      *out = JumpListCategory::Type::CUSTOM;
-    else
-      return false;
-
-    return true;
-  }
-
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   JumpListCategory::Type val) {
-    std::string category_type;
-    switch (val) {
-      case JumpListCategory::Type::TASKS:
-        category_type = "tasks";
-        break;
-
-      case JumpListCategory::Type::FREQUENT:
-        category_type = "frequent";
-        break;
-
-      case JumpListCategory::Type::RECENT:
-        category_type = "recent";
-        break;
-
-      case JumpListCategory::Type::CUSTOM:
-        category_type = "custom";
-        break;
-    }
-    return mate::ConvertToV8(isolate, category_type);
-  }
-};
-
-template<>
-struct Converter<JumpListCategory> {
-  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-                     JumpListCategory* out) {
-    mate::Dictionary dict;
-    if (!ConvertFromV8(isolate, val, &dict))
-      return false;
-
-    if (dict.Get("name", &(out->name)) && out->name.empty())
-      return false;
-
-    if (!dict.Get("type", &(out->type))) {
-      if (out->name.empty())
-        out->type = JumpListCategory::Type::TASKS;
-      else
-        out->type = JumpListCategory::Type::CUSTOM;
-    }
-
-    if ((out->type == JumpListCategory::Type::TASKS) ||
-        (out->type == JumpListCategory::Type::CUSTOM)) {
-      if (!dict.Get("items", &(out->items)))
-        return false;
-    }
-
-    return true;
-  }
-};
-
-// static
-template<>
-struct Converter<JumpListResult> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, JumpListResult val) {
-    std::string result_code;
-    switch (val) {
-      case JumpListResult::SUCCESS:
-        result_code = "ok";
-        break;
-
-      case JumpListResult::ARGUMENT_ERROR:
-        result_code = "argumentError";
-        break;
-
-      case JumpListResult::GENERIC_ERROR:
-        result_code = "error";
-        break;
-
-      case JumpListResult::CUSTOM_CATEGORY_SEPARATOR_ERROR:
-        result_code = "invalidSeparatorError";
-        break;
-
-      case JumpListResult::MISSING_FILE_TYPE_REGISTRATION_ERROR:
-        result_code = "fileTypeRegistrationError";
-        break;
-
-      case JumpListResult::CUSTOM_CATEGORY_ACCESS_DENIED_ERROR:
-        result_code = "customCategoryAccessDeniedError";
-        break;
-    }
-    return ConvertToV8(isolate, result_code);
-  }
-};
 #endif

-template<>
-struct Converter<Browser::LoginItemSettings> {
-  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-                     Browser::LoginItemSettings* out) {
-    mate::Dictionary dict;
-    if (!ConvertFromV8(isolate, val, &dict))
-      return false;
-
-    dict.Get("openAtLogin", &(out->open_at_login));
-    dict.Get("openAsHidden", &(out->open_as_hidden));
-    return true;
-  }
-
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   Browser::LoginItemSettings val) {
-    mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-    dict.Set("openAtLogin", val.open_at_login);
-    dict.Set("openAsHidden", val.open_as_hidden);
-    dict.Set("restoreState", val.restore_state);
-    dict.Set("wasOpenedAtLogin", val.opened_at_login);
-    dict.Set("wasOpenedAsHidden", val.opened_as_hidden);
-    return dict.GetHandle();
-  }
-};
 }  // namespace mate


@@ -351,8 +106,6 @@ int GetPathConstant(const std::string& name) {
    return chrome::DIR_USER_PICTURES;
  else if (name == "videos")
    return chrome::DIR_USER_VIDEOS;
-  else if (name == "pepperFlashSystemPlugin")
-    return chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN;
  else
    return -1;
 }
@@ -384,12 +137,13 @@ void OnClientCertificateSelected(
    return;
  }

-  std::string data;
+  v8::Local<v8::Object> data;
  if (!cert_data.Get("data", &data))
    return;

  auto certs = net::X509Certificate::CreateCertificateListFromBytes(
-      data.c_str(), data.length(), net::X509Certificate::FORMAT_AUTO);
+      node::Buffer::Data(data), node::Buffer::Length(data),
+      net::X509Certificate::FORMAT_AUTO);
  if (certs.size() > 0)
    delegate->ContinueWithCertificate(certs[0].get());
 }
@@ -403,46 +157,12 @@ void PassLoginInformation(scoped_refptr<LoginHandler> login_handler,
    login_handler->CancelAuth();
 }

-#if defined(USE_NSS_CERTS)
-int ImportIntoCertStore(
-    CertificateManagerModel* model,
-    const base::DictionaryValue& options) {
-  std::string file_data, cert_path;
-  base::string16 password;
-  net::CertificateList imported_certs;
-  int rv = -1;
-  options.GetString("certificate", &cert_path);
-  options.GetString("password", &password);
-
-  if (!cert_path.empty()) {
-    if (base::ReadFileToString(base::FilePath(cert_path), &file_data)) {
-      auto module = model->cert_db()->GetPublicModule();
-      rv = model->ImportFromPKCS12(module,
-                                   file_data,
-                                   password,
-                                   true,
-                                   &imported_certs);
-      if (imported_certs.size() > 1) {
-        auto it = imported_certs.begin();
-        ++it;  // skip first which would  be the client certificate.
-        for (; it != imported_certs.end(); ++it)
-          rv &= model->SetCertTrust(it->get(),
-                                    net::CA_CERT,
-                                    net::NSSCertDatabase::TRUSTED_SSL);
-      }
-    }
-  }
-  return rv;
-}
-#endif
-
 }  // namespace

-App::App(v8::Isolate* isolate) {
+App::App() {
  static_cast<AtomBrowserClient*>(AtomBrowserClient::Get())->set_delegate(this);
  Browser::Get()->AddObserver(this);
  content::GpuDataManager::GetInstance()->AddObserver(this);
-  Init(isolate);
 }

 App::~App() {
@@ -490,36 +210,17 @@ void App::OnWillFinishLaunching() {
  Emit("will-finish-launching");
 }

-void App::OnFinishLaunching(const base::DictionaryValue& launch_info) {
-#if defined(OS_LINUX)
-  // Set the application name for audio streams shown in external
-  // applications. Only affects pulseaudio currently.
-  media::AudioManager::SetGlobalAppName(Browser::Get()->GetName());
-#endif
-  Emit("ready", launch_info);
+void App::OnFinishLaunching() {
+  Emit("ready");
 }

-void App::OnAccessibilitySupportChanged() {
-  Emit("accessibility-support-changed", IsAccessibilitySupportEnabled());
-}
-
-#if defined(OS_MACOSX)
-void App::OnContinueUserActivity(
-    bool* prevent_default,
-    const std::string& type,
-    const base::DictionaryValue& user_info) {
-  *prevent_default = Emit("continue-activity", type, user_info);
-}
-#endif
-
-void App::OnLogin(LoginHandler* login_handler,
-                  const base::DictionaryValue& request_details) {
+void App::OnLogin(LoginHandler* login_handler) {
  v8::Locker locker(isolate());
  v8::HandleScope handle_scope(isolate());
  bool prevent_default = Emit(
      "login",
      WebContents::CreateFrom(isolate(), login_handler->GetWebContents()),
-      request_details,
+      login_handler->request(),
      login_handler->auth_info(),
      base::Bind(&PassLoginInformation, make_scoped_refptr(login_handler)));

@@ -528,32 +229,9 @@ void App::OnLogin(LoginHandler* login_handler,
    login_handler->CancelAuth();
 }

-void App::OnCreateWindow(
-    const GURL& target_url,
-    const std::string& frame_name,
-    WindowOpenDisposition disposition,
-    const std::vector<base::string16>& features,
-    const scoped_refptr<content::ResourceRequestBodyImpl>& body,
-    int render_process_id,
-    int render_frame_id) {
-  v8::Locker locker(isolate());
-  v8::HandleScope handle_scope(isolate());
-  content::RenderFrameHost* rfh =
-      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
-  content::WebContents* web_contents =
-      content::WebContents::FromRenderFrameHost(rfh);
-  if (web_contents) {
-    auto api_web_contents = WebContents::CreateFrom(isolate(), web_contents);
-    api_web_contents->OnCreateWindow(target_url,
-                                     frame_name,
-                                     disposition,
-                                     features,
-                                     body);
-  }
-}
-
 void App::AllowCertificateError(
-    content::WebContents* web_contents,
+    int pid,
+    int fid,
    int cert_error,
    const net::SSLInfo& ssl_info,
    const GURL& request_url,
@@ -563,6 +241,9 @@ void App::AllowCertificateError(
    bool expired_previous_decision,
    const base::Callback<void(bool)>& callback,
    content::CertificateRequestResultType* request) {
+  auto rfh = content::RenderFrameHost::FromID(pid, fid);
+  auto web_contents = content::WebContents::FromRenderFrameHost(rfh);
+
  v8::Locker locker(isolate());
  v8::HandleScope handle_scope(isolate());
  bool prevent_default = Emit("certificate-error",
@@ -580,7 +261,7 @@ void App::AllowCertificateError(
 void App::SelectClientCertificate(
    content::WebContents* web_contents,
    net::SSLCertRequestInfo* cert_request_info,
-    std::unique_ptr<content::ClientCertificateDelegate> delegate) {
+    scoped_ptr<content::ClientCertificateDelegate> delegate) {
  std::shared_ptr<content::ClientCertificateDelegate>
      shared_delegate(delegate.release());
  bool prevent_default =
@@ -598,11 +279,16 @@ void App::SelectClientCertificate(
        cert_request_info->client_certs[0].get());
 }

-void App::OnGpuProcessCrashed(base::TerminationStatus status) {
-  Emit("gpu-process-crashed",
-    status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED);
+void App::OnGpuProcessCrashed(base::TerminationStatus exit_code) {
+  Emit("gpu-process-crashed");
 }

+#if defined(OS_MACOSX)
+void App::OnPlatformThemeChanged() {
+  Emit("platform-theme-changed");
+}
+#endif
+
 base::FilePath App::GetPath(mate::Arguments* args, const std::string& name) {
  bool succeed = false;
  base::FilePath path;
@@ -610,37 +296,44 @@ base::FilePath App::GetPath(mate::Arguments* args, const std::string& name) {
  if (key >= 0)
    succeed = PathService::Get(key, &path);
  if (!succeed)
-    args->ThrowError("Failed to get '" + name + "' path");
+    args->ThrowError("Failed to get path");
  return path;
 }

 void App::SetPath(mate::Arguments* args,
                  const std::string& name,
                  const base::FilePath& path) {
-  if (!path.IsAbsolute()) {
-    args->ThrowError("Path must be absolute");
-    return;
-  }
-
  bool succeed = false;
  int key = GetPathConstant(name);
  if (key >= 0)
-    succeed = PathService::OverrideAndCreateIfNeeded(key, path, true, false);
+    succeed = PathService::Override(key, path);
  if (!succeed)
    args->ThrowError("Failed to set path");
 }

 void App::SetDesktopName(const std::string& desktop_name) {
 #if defined(OS_LINUX)
-  std::unique_ptr<base::Environment> env(base::Environment::Create());
+  scoped_ptr<base::Environment> env(base::Environment::Create());
  env->SetVar("CHROME_DESKTOP", desktop_name);
 #endif
 }

+void App::AllowNTLMCredentialsForAllDomains(bool should_allow) {
+  auto browser_context = static_cast<AtomBrowserContext*>(
+        AtomBrowserMainParts::Get()->browser_context());
+  browser_context->AllowNTLMCredentialsForAllDomains(should_allow);
+}
+
 std::string App::GetLocale() {
  return l10n_util::GetApplicationLocale("");
 }

+#if defined(OS_WIN)
+bool App::IsAeroGlassEnabled() {
+  return ui::win::IsAeroGlassEnabled();
+}
+#endif
+
 bool App::MakeSingleInstance(
    const ProcessSingleton::NotificationCallback& callback) {
  if (process_singleton_.get())
@@ -663,163 +356,10 @@ bool App::MakeSingleInstance(
  }
 }

-void App::ReleaseSingleInstance() {
-  if (process_singleton_.get()) {
-    process_singleton_->Cleanup();
-    process_singleton_.reset();
-  }
-}
-
-bool App::Relaunch(mate::Arguments* js_args) {
-  // Parse parameters.
-  bool override_argv = false;
-  base::FilePath exec_path;
-  relauncher::StringVector args;
-
-  mate::Dictionary options;
-  if (js_args->GetNext(&options)) {
-    if (options.Get("execPath", &exec_path) | options.Get("args", &args))
-      override_argv = true;
-  }
-
-  if (!override_argv) {
-#if defined(OS_WIN)
-    const relauncher::StringVector& argv = atom::AtomCommandLine::wargv();
-#else
-    const relauncher::StringVector& argv = atom::AtomCommandLine::argv();
-#endif
-    return relauncher::RelaunchApp(argv);
-  }
-
-  relauncher::StringVector argv;
-  argv.reserve(1 + args.size());
-
-  if (exec_path.empty()) {
-    base::FilePath current_exe_path;
-    PathService::Get(base::FILE_EXE, &current_exe_path);
-    argv.push_back(current_exe_path.value());
-  } else {
-    argv.push_back(exec_path.value());
-  }
-
-  argv.insert(argv.end(), args.begin(), args.end());
-
-  return relauncher::RelaunchApp(argv);
-}
-
-void App::DisableHardwareAcceleration(mate::Arguments* args) {
-  if (Browser::Get()->is_ready()) {
-    args->ThrowError("app.disableHardwareAcceleration() can only be called "
-                     "before app is ready");
-    return;
-  }
-  content::GpuDataManager::GetInstance()->DisableHardwareAcceleration();
-}
-
-bool App::IsAccessibilitySupportEnabled() {
-  auto ax_state = content::BrowserAccessibilityState::GetInstance();
-  return ax_state->IsAccessibleBrowser();
-}
-
-#if defined(USE_NSS_CERTS)
-void App::ImportCertificate(
-    const base::DictionaryValue& options,
-    const net::CompletionCallback& callback) {
-  auto browser_context = AtomBrowserContext::From("", false);
-  if (!certificate_manager_model_) {
-    std::unique_ptr<base::DictionaryValue> copy = options.CreateDeepCopy();
-    CertificateManagerModel::Create(
-        browser_context.get(),
-        base::Bind(&App::OnCertificateManagerModelCreated,
-                   base::Unretained(this),
-                   base::Passed(&copy),
-                   callback));
-    return;
-  }
-
-  int rv = ImportIntoCertStore(certificate_manager_model_.get(), options);
-  callback.Run(rv);
-}
-
-void App::OnCertificateManagerModelCreated(
-    std::unique_ptr<base::DictionaryValue> options,
-    const net::CompletionCallback& callback,
-    std::unique_ptr<CertificateManagerModel> model) {
-  certificate_manager_model_ = std::move(model);
-  int rv = ImportIntoCertStore(certificate_manager_model_.get(),
-                               *(options.get()));
-  callback.Run(rv);
-}
-#endif
-
-#if defined(OS_WIN)
-v8::Local<v8::Value> App::GetJumpListSettings() {
-  JumpList jump_list(Browser::Get()->GetAppUserModelID());
-
-  int min_items = 10;
-  std::vector<JumpListItem> removed_items;
-  if (jump_list.Begin(&min_items, &removed_items)) {
-    // We don't actually want to change anything, so abort the transaction.
-    jump_list.Abort();
-  } else {
-    LOG(ERROR) << "Failed to begin Jump List transaction.";
-  }
-
-  auto dict = mate::Dictionary::CreateEmpty(isolate());
-  dict.Set("minItems", min_items);
-  dict.Set("removedItems", mate::ConvertToV8(isolate(), removed_items));
-  return dict.GetHandle();
-}
-
-JumpListResult App::SetJumpList(v8::Local<v8::Value> val,
-                                mate::Arguments* args) {
-  std::vector<JumpListCategory> categories;
-  bool delete_jump_list = val->IsNull();
-  if (!delete_jump_list &&
-    !mate::ConvertFromV8(args->isolate(), val, &categories)) {
-    args->ThrowError("Argument must be null or an array of categories");
-    return JumpListResult::ARGUMENT_ERROR;
-  }
-
-  JumpList jump_list(Browser::Get()->GetAppUserModelID());
-
-  if (delete_jump_list) {
-    return jump_list.Delete()
-      ? JumpListResult::SUCCESS
-      : JumpListResult::GENERIC_ERROR;
-  }
-
-  // Start a transaction that updates the JumpList of this application.
-  if (!jump_list.Begin())
-    return JumpListResult::GENERIC_ERROR;
-
-  JumpListResult result = jump_list.AppendCategories(categories);
-  // AppendCategories may have failed to add some categories, but it's better
-  // to have something than nothing so try to commit the changes anyway.
-  if (!jump_list.Commit()) {
-    LOG(ERROR) << "Failed to commit changes to custom Jump List.";
-    // It's more useful to return the earlier error code that might give
-    // some indication as to why the transaction actually failed, so don't
-    // overwrite it with a "generic error" code here.
-    if (result == JumpListResult::SUCCESS)
-      result = JumpListResult::GENERIC_ERROR;
-  }
-
-  return result;
-}
-#endif  // defined(OS_WIN)
-
-// static
-mate::Handle<App> App::Create(v8::Isolate* isolate) {
-  return mate::CreateHandle(isolate, new App(isolate));
-}
-
-// static
-void App::BuildPrototype(
-    v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "App"));
+mate::ObjectTemplateBuilder App::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
  auto browser = base::Unretained(Browser::Get());
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+  return mate::ObjectTemplateBuilder(isolate)
      .SetMethod("quit", base::Bind(&Browser::Quit, browser))
      .SetMethod("exit", base::Bind(&Browser::Exit, browser))
      .SetMethod("focus", base::Bind(&Browser::Focus, browser))
@@ -834,51 +374,29 @@ void App::BuildPrototype(
                 base::Bind(&Browser::ClearRecentDocuments, browser))
      .SetMethod("setAppUserModelId",
                 base::Bind(&Browser::SetAppUserModelID, browser))
-      .SetMethod("isDefaultProtocolClient",
-                 base::Bind(&Browser::IsDefaultProtocolClient, browser))
-      .SetMethod("setAsDefaultProtocolClient",
-                 base::Bind(&Browser::SetAsDefaultProtocolClient, browser))
-      .SetMethod("removeAsDefaultProtocolClient",
-                 base::Bind(&Browser::RemoveAsDefaultProtocolClient, browser))
-      .SetMethod("setBadgeCount", base::Bind(&Browser::SetBadgeCount, browser))
-      .SetMethod("getBadgeCount", base::Bind(&Browser::GetBadgeCount, browser))
-      .SetMethod("getLoginItemSettings",
-                 base::Bind(&Browser::GetLoginItemSettings, browser))
-      .SetMethod("setLoginItemSettings",
-                 base::Bind(&Browser::SetLoginItemSettings, browser))
 #if defined(OS_MACOSX)
      .SetMethod("hide", base::Bind(&Browser::Hide, browser))
      .SetMethod("show", base::Bind(&Browser::Show, browser))
-      .SetMethod("setUserActivity",
-                 base::Bind(&Browser::SetUserActivity, browser))
-      .SetMethod("getCurrentActivityType",
-                 base::Bind(&Browser::GetCurrentActivityType, browser))
-      .SetMethod("setAboutPanelOptions",
-                 base::Bind(&Browser::SetAboutPanelOptions, browser))
+      .SetMethod("isDarkMode",
+                 base::Bind(&Browser::IsDarkMode, browser))
 #endif
 #if defined(OS_WIN)
-      .SetMethod("setUserTasks", base::Bind(&Browser::SetUserTasks, browser))
-      .SetMethod("getJumpListSettings", &App::GetJumpListSettings)
-      .SetMethod("setJumpList", &App::SetJumpList)
-#endif
-#if defined(OS_LINUX)
-      .SetMethod("isUnityRunning",
-                 base::Bind(&Browser::IsUnityRunning, browser))
+      .SetMethod("setUserTasks",
+                 base::Bind(&Browser::SetUserTasks, browser))
+      .SetMethod("isAeroGlassEnabled", &App::IsAeroGlassEnabled)
 #endif
      .SetMethod("setPath", &App::SetPath)
      .SetMethod("getPath", &App::GetPath)
      .SetMethod("setDesktopName", &App::SetDesktopName)
+      .SetMethod("allowNTLMCredentialsForAllDomains",
+                 &App::AllowNTLMCredentialsForAllDomains)
      .SetMethod("getLocale", &App::GetLocale)
-#if defined(USE_NSS_CERTS)
-      .SetMethod("importCertificate", &App::ImportCertificate)
-#endif
-      .SetMethod("makeSingleInstance", &App::MakeSingleInstance)
-      .SetMethod("releaseSingleInstance", &App::ReleaseSingleInstance)
-      .SetMethod("relaunch", &App::Relaunch)
-      .SetMethod("isAccessibilitySupportEnabled",
-                 &App::IsAccessibilitySupportEnabled)
-      .SetMethod("disableHardwareAcceleration",
-                 &App::DisableHardwareAcceleration);
+      .SetMethod("makeSingleInstance", &App::MakeSingleInstance);
+}
+
+// static
+mate::Handle<App> App::Create(v8::Isolate* isolate) {
+  return CreateHandle(isolate, new App);
 }

 }  // namespace api
@@ -891,8 +409,8 @@ 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) ||
+  if (switch_string == atom::switches::kPpapiFlashPath ||
+      switch_string == atom::switches::kClientCertificate ||
      switch_string == switches::kLogNetLog) {
    base::FilePath path;
    args->GetNext(&path);
@@ -928,7 +446,6 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
  auto command_line = base::CommandLine::ForCurrentProcess();

  mate::Dictionary dict(isolate, exports);
-  dict.Set("App", atom::api::App::GetConstructor(isolate)->GetFunction());
  dict.Set("app", atom::api::App::Create(isolate));
  dict.SetMethod("appendSwitch", &AppendSwitch);
  dict.SetMethod("appendArgument",
@@ -939,15 +456,12 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
  dict.SetMethod("dockBounce", &DockBounce);
  dict.SetMethod("dockCancelBounce",
                 base::Bind(&Browser::DockCancelBounce, browser));
-  dict.SetMethod("dockDownloadFinished",
-                 base::Bind(&Browser::DockDownloadFinished, browser));
  dict.SetMethod("dockSetBadgeText",
                 base::Bind(&Browser::DockSetBadgeText, browser));
  dict.SetMethod("dockGetBadgeText",
                 base::Bind(&Browser::DockGetBadgeText, browser));
  dict.SetMethod("dockHide", base::Bind(&Browser::DockHide, browser));
  dict.SetMethod("dockShow", base::Bind(&Browser::DockShow, browser));
-  dict.SetMethod("dockIsVisible", base::Bind(&Browser::DockIsVisible, browser));
  dict.SetMethod("dockSetMenu", &DockSetMenu);
  dict.SetMethod("dockSetIcon", base::Bind(&Browser::DockSetIcon, browser));
 #endif
--- a/atom/browser/api/atom_api_app.h
+++ b/atom/browser/api/atom_api_app.h
@@ -6,7 +6,6 @@
 #define ATOM_BROWSER_API_ATOM_API_APP_H_

 #include <string>
-#include <vector>

 #include "atom/browser/api/event_emitter.h"
 #include "atom/browser/atom_browser_client.h"
@@ -15,11 +14,6 @@
 #include "chrome/browser/process_singleton.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "native_mate/handle.h"
-#include "net/base/completion_callback.h"
-
-#if defined(USE_NSS_CERTS)
-#include "chrome/browser/certificate_manager_model.h"
-#endif

 namespace base {
 class FilePath;
@@ -27,46 +21,22 @@ class FilePath;

 namespace mate {
 class Arguments;
-}  // namespace mate
+}

 namespace atom {

-#if defined(OS_WIN)
-enum class JumpListResult : int;
-#endif
-
 namespace api {

 class App : public AtomBrowserClient::Delegate,
-            public mate::EventEmitter<App>,
+            public mate::EventEmitter,
            public BrowserObserver,
            public content::GpuDataManagerObserver {
 public:
  static mate::Handle<App> Create(v8::Isolate* isolate);

-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
-  // Called when window with disposition needs to be created.
-  void OnCreateWindow(
-      const GURL& target_url,
-      const std::string& frame_name,
-      WindowOpenDisposition disposition,
-      const std::vector<base::string16>& features,
-      const scoped_refptr<content::ResourceRequestBodyImpl>& body,
-      int render_process_id,
-      int render_frame_id);
-
-#if defined(USE_NSS_CERTS)
-  void OnCertificateManagerModelCreated(
-      std::unique_ptr<base::DictionaryValue> options,
-      const net::CompletionCallback& callback,
-      std::unique_ptr<CertificateManagerModel> model);
-#endif
-
 protected:
-  explicit App(v8::Isolate* isolate);
-  ~App() override;
+  App();
+  virtual ~App();

  // BrowserObserver:
  void OnBeforeQuit(bool* prevent_default) override;
@@ -77,20 +47,13 @@ class App : public AtomBrowserClient::Delegate,
  void OnOpenURL(const std::string& url) override;
  void OnActivate(bool has_visible_windows) override;
  void OnWillFinishLaunching() override;
-  void OnFinishLaunching(const base::DictionaryValue& launch_info) override;
-  void OnLogin(LoginHandler* login_handler,
-               const base::DictionaryValue& request_details) override;
-  void OnAccessibilitySupportChanged() override;
-#if defined(OS_MACOSX)
-  void OnContinueUserActivity(
-      bool* prevent_default,
-      const std::string& type,
-      const base::DictionaryValue& user_info) override;
-#endif
+  void OnFinishLaunching() override;
+  void OnLogin(LoginHandler* login_handler) override;

  // content::ContentBrowserClient:
  void AllowCertificateError(
-      content::WebContents* web_contents,
+      int render_process_id,
+      int render_frame_id,
      int cert_error,
      const net::SSLInfo& ssl_info,
      const GURL& request_url,
@@ -103,10 +66,18 @@ class App : public AtomBrowserClient::Delegate,
  void SelectClientCertificate(
      content::WebContents* web_contents,
      net::SSLCertRequestInfo* cert_request_info,
-      std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
+      scoped_ptr<content::ClientCertificateDelegate> delegate) override;

  // content::GpuDataManagerObserver:
-  void OnGpuProcessCrashed(base::TerminationStatus status) override;
+  void OnGpuProcessCrashed(base::TerminationStatus exit_code) override;
+
+#if defined(OS_MACOSX)
+  void OnPlatformThemeChanged() override;
+#endif
+
+  // mate::Wrappable:
+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate) override;

 private:
  // Get/Set the pre-defined path in PathService.
@@ -116,32 +87,17 @@ class App : public AtomBrowserClient::Delegate,
               const base::FilePath& path);

  void SetDesktopName(const std::string& desktop_name);
-  std::string GetLocale();
+  void AllowNTLMCredentialsForAllDomains(bool should_allow);
  bool MakeSingleInstance(
      const ProcessSingleton::NotificationCallback& callback);
-  void ReleaseSingleInstance();
-  bool Relaunch(mate::Arguments* args);
-  void DisableHardwareAcceleration(mate::Arguments* args);
-  bool IsAccessibilitySupportEnabled();
-#if defined(USE_NSS_CERTS)
-  void ImportCertificate(const base::DictionaryValue& options,
-                         const net::CompletionCallback& callback);
-#endif
+  std::string GetLocale();

 #if defined(OS_WIN)
-  // Get the current Jump List settings.
-  v8::Local<v8::Value> GetJumpListSettings();
-
-  // Set or remove a custom Jump List for the application.
-  JumpListResult SetJumpList(v8::Local<v8::Value> val, mate::Arguments* args);
-#endif  // defined(OS_WIN)
-
-  std::unique_ptr<ProcessSingleton> process_singleton_;
-
-#if defined(USE_NSS_CERTS)
-  std::unique_ptr<CertificateManagerModel> certificate_manager_model_;
+  bool IsAeroGlassEnabled();
 #endif

+  scoped_ptr<ProcessSingleton> process_singleton_;
+
  DISALLOW_COPY_AND_ASSIGN(App);
 };

--- a/atom/browser/api/atom_api_auto_updater.cc
+++ b/atom/browser/api/atom_api_auto_updater.cc
@@ -4,12 +4,12 @@

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

+#include "base/time/time.h"
 #include "atom/browser/browser.h"
 #include "atom/browser/native_window.h"
 #include "atom/browser/window_list.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/node_includes.h"
-#include "base/time/time.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"

@@ -34,9 +34,8 @@ namespace atom {

 namespace api {

-AutoUpdater::AutoUpdater(v8::Isolate* isolate) {
+AutoUpdater::AutoUpdater() {
  auto_updater::AutoUpdater::SetDelegate(this);
-  Init(isolate);
 }

 AutoUpdater::~AutoUpdater() {
@@ -79,10 +78,12 @@ void AutoUpdater::OnWindowAllClosed() {
  QuitAndInstall();
 }

-void AutoUpdater::SetFeedURL(const std::string& url, mate::Arguments* args) {
-  auto_updater::AutoUpdater::HeaderMap headers;
-  args->GetNext(&headers);
-  auto_updater::AutoUpdater::SetFeedURL(url, headers);
+mate::ObjectTemplateBuilder AutoUpdater::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
+  return mate::ObjectTemplateBuilder(isolate)
+      .SetMethod("setFeedURL", &auto_updater::AutoUpdater::SetFeedURL)
+      .SetMethod("checkForUpdates", &auto_updater::AutoUpdater::CheckForUpdates)
+      .SetMethod("quitAndInstall", &AutoUpdater::QuitAndInstall);
 }

 void AutoUpdater::QuitAndInstall() {
@@ -101,18 +102,7 @@ void AutoUpdater::QuitAndInstall() {

 // static
 mate::Handle<AutoUpdater> AutoUpdater::Create(v8::Isolate* isolate) {
-  return mate::CreateHandle(isolate, new AutoUpdater(isolate));
-}
-
-// static
-void AutoUpdater::BuildPrototype(
-    v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "AutoUpdater"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("checkForUpdates", &auto_updater::AutoUpdater::CheckForUpdates)
-      .SetMethod("getFeedURL", &auto_updater::AutoUpdater::GetFeedURL)
-      .SetMethod("setFeedURL", &AutoUpdater::SetFeedURL)
-      .SetMethod("quitAndInstall", &AutoUpdater::QuitAndInstall);
+  return CreateHandle(isolate, new AutoUpdater);
 }

 }  // namespace api
@@ -122,14 +112,11 @@ void AutoUpdater::BuildPrototype(

 namespace {

-using atom::api::AutoUpdater;
-
 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("autoUpdater", AutoUpdater::Create(isolate));
-  dict.Set("AutoUpdater", AutoUpdater::GetConstructor(isolate)->GetFunction());
+  dict.Set("autoUpdater", atom::api::AutoUpdater::Create(isolate));
 }

 }  // namespace
--- a/atom/browser/api/atom_api_auto_updater.h
+++ b/atom/browser/api/atom_api_auto_updater.h
@@ -10,25 +10,21 @@
 #include "atom/browser/api/event_emitter.h"
 #include "atom/browser/auto_updater.h"
 #include "atom/browser/window_list_observer.h"
-#include "native_mate/arguments.h"
 #include "native_mate/handle.h"

 namespace atom {

 namespace api {

-class AutoUpdater : public mate::EventEmitter<AutoUpdater>,
+class AutoUpdater : public mate::EventEmitter,
                    public auto_updater::Delegate,
                    public WindowListObserver {
 public:
  static mate::Handle<AutoUpdater> Create(v8::Isolate* isolate);

-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
 protected:
-  explicit AutoUpdater(v8::Isolate* isolate);
-  ~AutoUpdater() override;
+  AutoUpdater();
+  virtual ~AutoUpdater();

  // Delegate implementations.
  void OnError(const std::string& error) override;
@@ -43,9 +39,11 @@ class AutoUpdater : public mate::EventEmitter<AutoUpdater>,
  // WindowListObserver:
  void OnWindowAllClosed() override;

+  // mate::Wrappable implementations:
+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate) override;
+
 private:
-  std::string GetFeedURL();
-  void SetFeedURL(const std::string& url, mate::Arguments* args);
  void QuitAndInstall();

  DISALLOW_COPY_AND_ASSIGN(AutoUpdater);
--- a/atom/browser/api/atom_api_content_tracing.cc
+++ b/atom/browser/api/atom_api_content_tracing.cc
@@ -7,13 +7,12 @@

 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
+#include "atom/common/node_includes.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "content/public/browser/tracing_controller.h"
 #include "native_mate/dictionary.h"

-#include "atom/common/node_includes.h"
-
 using content::TracingController;

 namespace mate {
@@ -54,7 +53,13 @@ scoped_refptr<TracingController::TraceDataSink> GetTraceDataSink(

 void StopRecording(const base::FilePath& path,
                   const CompletionCallback& callback) {
-  TracingController::GetInstance()->StopTracing(
+  TracingController::GetInstance()->DisableRecording(
+      GetTraceDataSink(path, callback));
+}
+
+void CaptureMonitoringSnapshot(const base::FilePath& path,
+                               const CompletionCallback& callback) {
+  TracingController::GetInstance()->CaptureMonitoringSnapshot(
      GetTraceDataSink(path, callback));
 }

@@ -65,8 +70,13 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
  dict.SetMethod("getCategories", base::Bind(
      &TracingController::GetCategories, controller));
  dict.SetMethod("startRecording", base::Bind(
-      &TracingController::StartTracing, controller));
+      &TracingController::EnableRecording, controller));
  dict.SetMethod("stopRecording", &StopRecording);
+  dict.SetMethod("startMonitoring", base::Bind(
+      &TracingController::EnableMonitoring, controller));
+  dict.SetMethod("stopMonitoring", base::Bind(
+      &TracingController::DisableMonitoring, controller));
+  dict.SetMethod("captureMonitoringSnapshot", &CaptureMonitoringSnapshot);
  dict.SetMethod("getTraceBufferUsage", base::Bind(
      &TracingController::GetTraceBufferUsage, controller));
  dict.SetMethod("setWatchEvent", base::Bind(
--- a/atom/browser/api/atom_api_cookies.cc
+++ b/atom/browser/api/atom_api_cookies.cc
@@ -4,7 +4,6 @@

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

-#include "atom/browser/atom_browser_context.h"
 #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"
@@ -20,7 +19,6 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"

-using atom::AtomCookieDelegate;
 using content::BrowserThread;

 namespace mate {
@@ -32,7 +30,7 @@ struct Converter<atom::api::Cookies::Error> {
    if (val == atom::api::Cookies::SUCCESS)
      return v8::Null(isolate);
    else
-      return v8::Exception::Error(StringToV8(isolate, "Setting cookie failed"));
+      return v8::Exception::Error(StringToV8(isolate, "failed"));
  }
 };

@@ -49,33 +47,12 @@ struct Converter<net::CanonicalCookie> {
    dict.Set("secure", val.IsSecure());
    dict.Set("httpOnly", val.IsHttpOnly());
    dict.Set("session", !val.IsPersistent());
-    if (val.IsPersistent())
+    if (!val.IsPersistent())
      dict.Set("expirationDate", val.ExpiryDate().ToDoubleT());
    return dict.GetHandle();
  }
 };

-template<>
-struct Converter<AtomCookieDelegate::ChangeCause> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const AtomCookieDelegate::ChangeCause& val) {
-    switch (val) {
-      case AtomCookieDelegate::ChangeCause::CHANGE_COOKIE_EXPLICIT:
-        return mate::StringToV8(isolate, "explicit");
-      case AtomCookieDelegate::ChangeCause::CHANGE_COOKIE_OVERWRITE:
-        return mate::StringToV8(isolate, "overwrite");
-      case AtomCookieDelegate::ChangeCause::CHANGE_COOKIE_EXPIRED:
-        return mate::StringToV8(isolate, "expired");
-      case AtomCookieDelegate::ChangeCause::CHANGE_COOKIE_EVICTED:
-        return mate::StringToV8(isolate, "evicted");
-      case AtomCookieDelegate::ChangeCause::CHANGE_COOKIE_EXPIRED_OVERWRITE:
-        return mate::StringToV8(isolate, "expired-overwrite");
-      default:
-        return mate::StringToV8(isolate, "unknown");
-    }
-  }
-};
-
 }  // namespace mate

 namespace atom {
@@ -135,7 +112,7 @@ void RunCallbackInUI(const base::Closure& callback) {
 }

 // Remove cookies from |list| not matching |filter|, and pass it to |callback|.
-void FilterCookies(std::unique_ptr<base::DictionaryValue> filter,
+void FilterCookies(scoped_ptr<base::DictionaryValue> filter,
                   const Cookies::GetCallback& callback,
                   const net::CookieList& list) {
  net::CookieList result;
@@ -148,7 +125,7 @@ void FilterCookies(std::unique_ptr<base::DictionaryValue> filter,

 // Receives cookies matching |filter| in IO thread.
 void GetCookiesOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
-                    std::unique_ptr<base::DictionaryValue> filter,
+                    scoped_ptr<base::DictionaryValue> filter,
                    const Cookies::GetCallback& callback) {
  std::string url;
  filter->GetString("url", &url);
@@ -156,12 +133,12 @@ void GetCookiesOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
  auto filtered_callback =
      base::Bind(FilterCookies, base::Passed(&filter), callback);

+  net::CookieMonster* monster = GetCookieStore(getter)->GetCookieMonster();
  // Empty url will match all url cookies.
  if (url.empty())
-    GetCookieStore(getter)->GetAllCookiesAsync(filtered_callback);
+    monster->GetAllCookiesAsync(filtered_callback);
  else
-    GetCookieStore(getter)->GetAllCookiesForURLAsync(GURL(url),
-        filtered_callback);
+    monster->GetAllCookiesForURLAsync(GURL(url), filtered_callback);
 }

 // Removes cookie with |url| and |name| in IO thread.
@@ -180,14 +157,12 @@ void OnSetCookie(const Cookies::SetCallback& callback, bool success) {

 // Sets cookie with |details| in IO thread.
 void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
-                   std::unique_ptr<base::DictionaryValue> details,
+                   scoped_ptr<base::DictionaryValue> details,
                   const Cookies::SetCallback& callback) {
  std::string url, name, value, domain, path;
  bool secure = false;
  bool http_only = false;
-  double creation_date;
  double expiration_date;
-  double last_access_date;
  details->GetString("url", &url);
  details->GetString("name", &name);
  details->GetString("value", &value);
@@ -196,13 +171,6 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
  details->GetBoolean("secure", &secure);
  details->GetBoolean("httpOnly", &http_only);

-  base::Time creation_time;
-  if (details->GetDouble("creationDate", &creation_date)) {
-    creation_time = (creation_date == 0) ?
-        base::Time::UnixEpoch() :
-        base::Time::FromDoubleT(creation_date);
-  }
-
  base::Time expiration_time;
  if (details->GetDouble("expirationDate", &expiration_date)) {
    expiration_time = (expiration_date == 0) ?
@@ -210,37 +178,23 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
        base::Time::FromDoubleT(expiration_date);
  }

-  base::Time last_access_time;
-  if (details->GetDouble("lastAccessDate", &last_access_date)) {
-    last_access_time = (last_access_date == 0) ?
-        base::Time::UnixEpoch() :
-        base::Time::FromDoubleT(last_access_date);
-  }
-
-  GetCookieStore(getter)->SetCookieWithDetailsAsync(
-      GURL(url), name, value, domain, path, creation_time,
-      expiration_time, last_access_time, secure, http_only,
-      net::CookieSameSite::DEFAULT_MODE, false,
-      net::COOKIE_PRIORITY_DEFAULT, base::Bind(OnSetCookie, callback));
+  GetCookieStore(getter)->GetCookieMonster()->SetCookieWithDetailsAsync(
+      GURL(url), name, value, domain, path, expiration_time, secure, http_only,
+      false, net::COOKIE_PRIORITY_DEFAULT, base::Bind(OnSetCookie, callback));
 }

 }  // namespace

-Cookies::Cookies(v8::Isolate* isolate,
-                 AtomBrowserContext* browser_context)
-      : request_context_getter_(browser_context->url_request_context_getter()),
-        cookie_delegate_(browser_context->cookie_delegate()) {
-  Init(isolate);
-  cookie_delegate_->AddObserver(this);
+Cookies::Cookies(content::BrowserContext* browser_context)
+    : request_context_getter_(browser_context->GetRequestContext()) {
 }

 Cookies::~Cookies() {
-  cookie_delegate_->RemoveObserver(this);
 }

 void Cookies::Get(const base::DictionaryValue& filter,
                  const GetCallback& callback) {
-  std::unique_ptr<base::DictionaryValue> copied(filter.CreateDeepCopy());
+  scoped_ptr<base::DictionaryValue> copied(filter.CreateDeepCopy());
  auto getter = make_scoped_refptr(request_context_getter_);
  content::BrowserThread::PostTask(
      BrowserThread::IO, FROM_HERE,
@@ -257,32 +211,24 @@ void Cookies::Remove(const GURL& url, const std::string& name,

 void Cookies::Set(const base::DictionaryValue& details,
                  const SetCallback& callback) {
-  std::unique_ptr<base::DictionaryValue> copied(details.CreateDeepCopy());
+  scoped_ptr<base::DictionaryValue> copied(details.CreateDeepCopy());
  auto getter = make_scoped_refptr(request_context_getter_);
  content::BrowserThread::PostTask(
      BrowserThread::IO, FROM_HERE,
      base::Bind(SetCookieOnIO, getter, Passed(&copied), callback));
 }

-void Cookies::OnCookieChanged(const net::CanonicalCookie& cookie,
-                              bool removed,
-                              AtomCookieDelegate::ChangeCause cause) {
-  Emit("changed", cookie, cause, removed);
-}
-
-
 // static
 mate::Handle<Cookies> Cookies::Create(
    v8::Isolate* isolate,
-    AtomBrowserContext* browser_context) {
-  return mate::CreateHandle(isolate, new Cookies(isolate, browser_context));
+    content::BrowserContext* browser_context) {
+  return mate::CreateHandle(isolate, new Cookies(browser_context));
 }

 // static
 void Cookies::BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "Cookies"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+                             v8::Local<v8::ObjectTemplate> prototype) {
+  mate::ObjectTemplateBuilder(isolate, prototype)
      .SetMethod("get", &Cookies::Get)
      .SetMethod("remove", &Cookies::Remove)
      .SetMethod("set", &Cookies::Set);
--- a/atom/browser/api/atom_api_cookies.h
+++ b/atom/browser/api/atom_api_cookies.h
@@ -8,7 +8,6 @@
 #include <string>

 #include "atom/browser/api/trackable_object.h"
-#include "atom/browser/net/atom_cookie_delegate.h"
 #include "base/callback.h"
 #include "native_mate/handle.h"
 #include "net/cookies/canonical_cookie.h"
@@ -17,18 +16,19 @@ namespace base {
 class DictionaryValue;
 }

+namespace content {
+class BrowserContext;
+}
+
 namespace net {
 class URLRequestContextGetter;
 }

 namespace atom {

-class AtomBrowserContext;
-
 namespace api {

-class Cookies : public mate::TrackableObject<Cookies>,
-                public AtomCookieDelegate::Observer {
+class Cookies : public mate::TrackableObject<Cookies> {
 public:
  enum Error {
    SUCCESS,
@@ -39,29 +39,23 @@ class Cookies : public mate::TrackableObject<Cookies>,
  using SetCallback = base::Callback<void(Error)>;

  static mate::Handle<Cookies> Create(v8::Isolate* isolate,
-                                      AtomBrowserContext* browser_context);
+                                      content::BrowserContext* browser_context);

  // mate::TrackableObject:
  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
+                             v8::Local<v8::ObjectTemplate> prototype);

 protected:
-  Cookies(v8::Isolate* isolate, AtomBrowserContext* browser_context);
-  ~Cookies() override;
+  explicit Cookies(content::BrowserContext* browser_context);
+  ~Cookies();

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

-  // AtomCookieDelegate::Observer:
-  void OnCookieChanged(const net::CanonicalCookie& cookie,
-                       bool removed,
-                       AtomCookieDelegate::ChangeCause cause) override;
-
 private:
  net::URLRequestContextGetter* request_context_getter_;
-  scoped_refptr<AtomCookieDelegate> cookie_delegate_;

  DISALLOW_COPY_AND_ASSIGN(Cookies);
 };
--- a/atom/browser/api/atom_api_debugger.cc
+++ b/atom/browser/api/atom_api_debugger.cc
@@ -9,6 +9,7 @@
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "content/public/browser/devtools_agent_host.h"
@@ -16,18 +17,23 @@
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"

-#include "atom/common/node_includes.h"
-
 using content::DevToolsAgentHost;

 namespace atom {

 namespace api {

-Debugger::Debugger(v8::Isolate* isolate, content::WebContents* web_contents)
+namespace {
+
+// The wrapDebugger funtion which is implemented in JavaScript.
+using WrapDebuggerCallback = base::Callback<void(v8::Local<v8::Value>)>;
+WrapDebuggerCallback g_wrap_debugger;
+
+}  // namespace
+
+Debugger::Debugger(content::WebContents* web_contents)
    : web_contents_(web_contents),
      previous_request_id_(0) {
-  Init(isolate);
 }

 Debugger::~Debugger() {
@@ -45,7 +51,7 @@ void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
                                       const std::string& message) {
  DCHECK(agent_host == agent_host_.get());

-  std::unique_ptr<base::Value> parsed_message(base::JSONReader::Read(message));
+  scoped_ptr<base::Value> parsed_message(base::JSONReader::Read(message));
  if (!parsed_message->IsType(base::Value::TYPE_DICTIONARY))
    return;

@@ -108,7 +114,7 @@ bool Debugger::IsAttached() {
 void Debugger::Detach() {
  if (!agent_host_.get())
    return;
-  agent_host_->DetachClient(this);
+  agent_host_->DetachClient();
  AgentHostClosed(agent_host_.get(), false);
  agent_host_ = nullptr;
 }
@@ -137,40 +143,51 @@ void Debugger::SendCommand(mate::Arguments* args) {

  std::string json_args;
  base::JSONWriter::Write(request, &json_args);
-  agent_host_->DispatchProtocolMessage(this, json_args);
+  agent_host_->DispatchProtocolMessage(json_args);
 }

 // static
 mate::Handle<Debugger> Debugger::Create(
    v8::Isolate* isolate,
    content::WebContents* web_contents) {
-  return mate::CreateHandle(isolate, new Debugger(isolate, web_contents));
+  auto handle = mate::CreateHandle(isolate, new Debugger(web_contents));
+  g_wrap_debugger.Run(handle.ToV8());
+  return handle;
 }

 // static
 void Debugger::BuildPrototype(v8::Isolate* isolate,
-                              v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "Debugger"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+                              v8::Local<v8::ObjectTemplate> prototype) {
+  mate::ObjectTemplateBuilder(isolate, prototype)
      .SetMethod("attach", &Debugger::Attach)
      .SetMethod("isAttached", &Debugger::IsAttached)
      .SetMethod("detach", &Debugger::Detach)
      .SetMethod("sendCommand", &Debugger::SendCommand);
 }

+void ClearWrapDebugger() {
+  g_wrap_debugger.Reset();
+}
+
+void SetWrapDebugger(const WrapDebuggerCallback& callback) {
+  g_wrap_debugger = callback;
+
+  // Cleanup the wrapper on exit.
+  atom::AtomBrowserMainParts::Get()->RegisterDestructionCallback(
+      base::Bind(ClearWrapDebugger));
+}
+
 }  // namespace api

 }  // namespace atom

 namespace {

-using atom::api::Debugger;
-
 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(isolate, exports)
-      .Set("Debugger", Debugger::GetConstructor(isolate)->GetFunction());
+  mate::Dictionary dict(isolate, exports);
+  dict.SetMethod("_setWrapDebugger", &atom::api::SetWrapDebugger);
 }

 }  // namespace
--- a/atom/browser/api/atom_api_debugger.h
+++ b/atom/browser/api/atom_api_debugger.h
@@ -39,11 +39,11 @@ class Debugger: public mate::TrackableObject<Debugger>,

  // mate::TrackableObject:
  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
+                             v8::Local<v8::ObjectTemplate> prototype);

 protected:
-  Debugger(v8::Isolate* isolate, content::WebContents* web_contents);
-  ~Debugger() override;
+  explicit Debugger(content::WebContents* web_contents);
+  ~Debugger();

  // content::DevToolsAgentHostClient:
  void AgentHostClosed(content::DevToolsAgentHost* agent_host,
--- a/atom/browser/api/atom_api_desktop_capturer.cc
+++ b/atom/browser/api/atom_api_desktop_capturer.cc
@@ -5,6 +5,7 @@
 #include "atom/browser/api/atom_api_desktop_capturer.h"

 #include "atom/common/api/atom_api_native_image.h"
+#include "atom/common/node_includes.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/desktop_media_list.h"
@@ -13,8 +14,6 @@
 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h"

-#include "atom/common/node_includes.h"
-
 namespace mate {

 template<>
@@ -38,8 +37,7 @@ namespace atom {

 namespace api {

-DesktopCapturer::DesktopCapturer(v8::Isolate* isolate) {
-  Init(isolate);
+DesktopCapturer::DesktopCapturer() {
 }

 DesktopCapturer::~DesktopCapturer() {
@@ -61,12 +59,12 @@ void DesktopCapturer::StartHandling(bool capture_window,
  options.set_disable_effects(false);
 #endif

-  std::unique_ptr<webrtc::ScreenCapturer> screen_capturer(
+  scoped_ptr<webrtc::ScreenCapturer> screen_capturer(
      capture_screen ? webrtc::ScreenCapturer::Create(options) : nullptr);
-  std::unique_ptr<webrtc::WindowCapturer> window_capturer(
+  scoped_ptr<webrtc::WindowCapturer> window_capturer(
      capture_window ? webrtc::WindowCapturer::Create(options) : nullptr);
-  media_list_.reset(new NativeDesktopMediaList(
-      std::move(screen_capturer), std::move(window_capturer)));
+  media_list_.reset(new NativeDesktopMediaList(screen_capturer.Pass(),
+      window_capturer.Pass()));

  media_list_->SetThumbnailSize(thumbnail_size);
  media_list_->StartUpdating(this);
@@ -89,20 +87,19 @@ void DesktopCapturer::OnSourceThumbnailChanged(int index) {

 bool DesktopCapturer::OnRefreshFinished() {
  Emit("finished", media_list_->GetSources());
+  media_list_.reset();
  return false;
 }

+mate::ObjectTemplateBuilder DesktopCapturer::GetObjectTemplateBuilder(
+      v8::Isolate* isolate) {
+  return mate::ObjectTemplateBuilder(isolate)
+      .SetMethod("startHandling", &DesktopCapturer::StartHandling);
+}
+
 // static
 mate::Handle<DesktopCapturer> DesktopCapturer::Create(v8::Isolate* isolate) {
-  return mate::CreateHandle(isolate, new DesktopCapturer(isolate));
-}
-
-// static
-void DesktopCapturer::BuildPrototype(
-    v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "DesktopCapturer"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("startHandling", &DesktopCapturer::StartHandling);
+  return mate::CreateHandle(isolate, new DesktopCapturer);
 }

 }  // namespace api
--- a/atom/browser/api/atom_api_desktop_capturer.h
+++ b/atom/browser/api/atom_api_desktop_capturer.h
@@ -14,21 +14,18 @@ namespace atom {

 namespace api {

-class DesktopCapturer: public mate::EventEmitter<DesktopCapturer>,
+class DesktopCapturer: public mate::EventEmitter,
                       public DesktopMediaListObserver {
 public:
  static mate::Handle<DesktopCapturer> Create(v8::Isolate* isolate);

-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
  void StartHandling(bool capture_window,
                     bool capture_screen,
                     const gfx::Size& thumbnail_size);

 protected:
-  explicit DesktopCapturer(v8::Isolate* isolate);
-  ~DesktopCapturer() override;
+  DesktopCapturer();
+  ~DesktopCapturer();

  // DesktopMediaListObserver overrides.
  void OnSourceAdded(int index) override;
@@ -39,7 +36,11 @@ class DesktopCapturer: public mate::EventEmitter<DesktopCapturer>,
  bool OnRefreshFinished() override;

 private:
-  std::unique_ptr<DesktopMediaList> media_list_;
+  // mate::Wrappable:
+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate) override;
+
+  scoped_ptr<DesktopMediaList> media_list_;

  DISALLOW_COPY_AND_ASSIGN(DesktopCapturer);
 };
--- a/atom/browser/api/atom_api_dialog.cc
+++ b/atom/browser/api/atom_api_dialog.cc
@@ -67,7 +67,6 @@ void ShowMessageBox(int type,
 }

 void ShowOpenDialog(const std::string& title,
-                    const std::string& button_label,
                    const base::FilePath& default_path,
                    const file_dialog::Filters& filters,
                    int properties,
@@ -78,18 +77,17 @@ void ShowOpenDialog(const std::string& title,
  if (mate::Converter<file_dialog::OpenDialogCallback>::FromV8(args->isolate(),
                                                               peek,
                                                               &callback)) {
-    file_dialog::ShowOpenDialog(window, title, button_label, default_path,
-                                filters, properties, callback);
+    file_dialog::ShowOpenDialog(window, title, default_path, filters,
+                                properties, callback);
  } else {
    std::vector<base::FilePath> paths;
-    if (file_dialog::ShowOpenDialog(window, title, button_label, default_path,
-                                    filters, properties, &paths))
+    if (file_dialog::ShowOpenDialog(window, title, default_path, filters,
+                                    properties, &paths))
      args->Return(paths);
  }
 }

 void ShowSaveDialog(const std::string& title,
-                    const std::string& button_label,
                    const base::FilePath& default_path,
                    const file_dialog::Filters& filters,
                    atom::NativeWindow* window,
@@ -99,12 +97,11 @@ void ShowSaveDialog(const std::string& title,
  if (mate::Converter<file_dialog::SaveDialogCallback>::FromV8(args->isolate(),
                                                               peek,
                                                               &callback)) {
-    file_dialog::ShowSaveDialog(window, title, button_label, default_path,
-                                filters, callback);
+    file_dialog::ShowSaveDialog(window, title, default_path, filters, callback);
  } else {
    base::FilePath path;
-    if (file_dialog::ShowSaveDialog(window, title, button_label, default_path,
-                                    filters, &path))
+    if (file_dialog::ShowSaveDialog(window, title, default_path, filters,
+                                    &path))
      args->Return(path);
  }
 }
--- a/atom/browser/api/atom_api_download_item.cc
+++ b/atom/browser/api/atom_api_download_item.cc
@@ -10,13 +10,13 @@
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
+#include "atom/common/node_includes.h"
+#include "base/memory/linked_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "native_mate/dictionary.h"
 #include "net/base/filename_util.h"

-#include "atom/common/node_includes.h"
-
 namespace mate {

 template<>
@@ -25,9 +25,6 @@ struct Converter<content::DownloadItem::DownloadState> {
                                   content::DownloadItem::DownloadState state) {
    std::string download_state;
    switch (state) {
-      case content::DownloadItem::IN_PROGRESS:
-        download_state = "progressing";
-        break;
      case content::DownloadItem::COMPLETE:
        download_state = "completed";
        break;
@@ -52,15 +49,17 @@ namespace api {

 namespace {

-std::map<uint32_t, v8::Global<v8::Object>> g_download_item_objects;
+// The wrapDownloadItem funtion which is implemented in JavaScript
+using WrapDownloadItemCallback = base::Callback<void(v8::Local<v8::Value>)>;
+WrapDownloadItemCallback g_wrap_download_item;
+
+std::map<uint32, linked_ptr<v8::Global<v8::Value>>> g_download_item_objects;

 }  // namespace

-DownloadItem::DownloadItem(v8::Isolate* isolate,
-                           content::DownloadItem* download_item)
+DownloadItem::DownloadItem(content::DownloadItem* download_item)
    : download_item_(download_item) {
  download_item_->AddObserver(this);
-  Init(isolate);
  AttachAsUserData(download_item);
 }

@@ -72,7 +71,9 @@ DownloadItem::~DownloadItem() {
  }

  // Remove from the global map.
-  g_download_item_objects.erase(weak_map_id());
+  auto iter = g_download_item_objects.find(weak_map_id());
+  if (iter != g_download_item_objects.end())
+    g_download_item_objects.erase(iter);
 }

 void DownloadItem::OnDownloadUpdated(content::DownloadItem* item) {
@@ -82,7 +83,7 @@ void DownloadItem::OnDownloadUpdated(content::DownloadItem* item) {
    // Destroy the item once item is downloaded.
    base::MessageLoop::current()->PostTask(FROM_HERE, GetDestroyClosure());
  } else {
-    Emit("updated", item->GetState());
+    Emit("updated");
  }
 }

@@ -96,28 +97,20 @@ void DownloadItem::Pause() {
  download_item_->Pause();
 }

-bool DownloadItem::IsPaused() const {
-  return download_item_->IsPaused();
-}
-
 void DownloadItem::Resume() {
  download_item_->Resume();
 }

-bool DownloadItem::CanResume() const {
-  return download_item_->CanResume();
-}
-
 void DownloadItem::Cancel() {
  download_item_->Cancel(true);
  download_item_->Remove();
 }

-int64_t DownloadItem::GetReceivedBytes() const {
+int64 DownloadItem::GetReceivedBytes() const {
  return download_item_->GetReceivedBytes();
 }

-int64_t DownloadItem::GetTotalBytes() const {
+int64 DownloadItem::GetTotalBytes() const {
  return download_item_->GetTotalBytes();
 }

@@ -135,7 +128,7 @@ std::string DownloadItem::GetFilename() const {
                           std::string(),
                           download_item_->GetSuggestedFilename(),
                           GetMimeType(),
-                           "download").LossyDisplayName());
+                           std::string()).LossyDisplayName());
 }

 std::string DownloadItem::GetContentDisposition() const {
@@ -146,18 +139,6 @@ const GURL& DownloadItem::GetURL() const {
  return download_item_->GetURL();
 }

-const std::vector<GURL>& DownloadItem::GetURLChain() const {
-  return download_item_->GetUrlChain();
-}
-
-content::DownloadItem::DownloadState DownloadItem::GetState() const {
-  return download_item_->GetState();
-}
-
-bool DownloadItem::IsDone() const {
-  return download_item_->IsDone();
-}
-
 void DownloadItem::SetSavePath(const base::FilePath& path) {
  save_path_ = path;
 }
@@ -166,28 +147,13 @@ base::FilePath DownloadItem::GetSavePath() const {
  return save_path_;
 }

-std::string DownloadItem::GetLastModifiedTime() const {
-  return download_item_->GetLastModifiedTime();
-}
-
-std::string DownloadItem::GetETag() const {
-  return download_item_->GetETag();
-}
-
-double DownloadItem::GetStartTime() const {
-  return download_item_->GetStartTime().ToDoubleT();
-}
-
 // static
 void DownloadItem::BuildPrototype(v8::Isolate* isolate,
-                                  v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "DownloadItem"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+                                  v8::Local<v8::ObjectTemplate> prototype) {
+  mate::ObjectTemplateBuilder(isolate, prototype)
      .MakeDestroyable()
      .SetMethod("pause", &DownloadItem::Pause)
-      .SetMethod("isPaused", &DownloadItem::IsPaused)
      .SetMethod("resume", &DownloadItem::Resume)
-      .SetMethod("canResume", &DownloadItem::CanResume)
      .SetMethod("cancel", &DownloadItem::Cancel)
      .SetMethod("getReceivedBytes", &DownloadItem::GetReceivedBytes)
      .SetMethod("getTotalBytes", &DownloadItem::GetTotalBytes)
@@ -196,14 +162,8 @@ void DownloadItem::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("getFilename", &DownloadItem::GetFilename)
      .SetMethod("getContentDisposition", &DownloadItem::GetContentDisposition)
      .SetMethod("getURL", &DownloadItem::GetURL)
-      .SetMethod("getURLChain", &DownloadItem::GetURLChain)
-      .SetMethod("getState", &DownloadItem::GetState)
-      .SetMethod("isDone", &DownloadItem::IsDone)
      .SetMethod("setSavePath", &DownloadItem::SetSavePath)
-      .SetMethod("getSavePath", &DownloadItem::GetSavePath)
-      .SetMethod("getLastModifiedTime", &DownloadItem::GetLastModifiedTime)
-      .SetMethod("getETag", &DownloadItem::GetETag)
-      .SetMethod("getStartTime", &DownloadItem::GetStartTime);
+      .SetMethod("getSavePath", &DownloadItem::GetSavePath);
 }

 // static
@@ -213,14 +173,27 @@ mate::Handle<DownloadItem> DownloadItem::Create(
  if (existing)
    return mate::CreateHandle(isolate, static_cast<DownloadItem*>(existing));

-  auto handle = mate::CreateHandle(isolate, new DownloadItem(isolate, item));
+  auto handle = mate::CreateHandle(isolate, new DownloadItem(item));
+  g_wrap_download_item.Run(handle.ToV8());

  // Reference this object in case it got garbage collected.
-  g_download_item_objects[handle->weak_map_id()] =
-      v8::Global<v8::Object>(isolate, handle.ToV8());
+  g_download_item_objects[handle->weak_map_id()] = make_linked_ptr(
+      new v8::Global<v8::Value>(isolate, handle.ToV8()));
  return handle;
 }

+void ClearWrapDownloadItem() {
+  g_wrap_download_item.Reset();
+}
+
+void SetWrapDownloadItem(const WrapDownloadItemCallback& callback) {
+  g_wrap_download_item = callback;
+
+  // Cleanup the wrapper on exit.
+  atom::AtomBrowserMainParts::Get()->RegisterDestructionCallback(
+      base::Bind(ClearWrapDownloadItem));
+}
+
 }  // namespace api

 }  // namespace atom
@@ -230,9 +203,8 @@ namespace {
 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(isolate, exports)
-      .Set("DownloadItem",
-           atom::api::DownloadItem::GetConstructor(isolate)->GetFunction());
+  mate::Dictionary dict(isolate, exports);
+  dict.SetMethod("_setWrapDownloadItem", &atom::api::SetWrapDownloadItem);
 }

 }  // namespace
--- a/atom/browser/api/atom_api_download_item.h
+++ b/atom/browser/api/atom_api_download_item.h
@@ -6,7 +6,6 @@
 #define ATOM_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_

 #include <string>
-#include <vector>

 #include "atom/browser/api/trackable_object.h"
 #include "base/files/file_path.h"
@@ -24,32 +23,25 @@ class DownloadItem : public mate::TrackableObject<DownloadItem>,
  static mate::Handle<DownloadItem> Create(v8::Isolate* isolate,
                                           content::DownloadItem* item);

+  // mate::TrackableObject:
  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
+                             v8::Local<v8::ObjectTemplate> prototype);

  void Pause();
-  bool IsPaused() const;
  void Resume();
-  bool CanResume() const;
  void Cancel();
-  int64_t GetReceivedBytes() const;
-  int64_t GetTotalBytes() const;
+  int64 GetReceivedBytes() const;
+  int64 GetTotalBytes() const;
  std::string GetMimeType() const;
  bool HasUserGesture() const;
  std::string GetFilename() const;
  std::string GetContentDisposition() const;
  const GURL& GetURL() const;
-  const std::vector<GURL>& GetURLChain() const;
-  content::DownloadItem::DownloadState GetState() const;
-  bool IsDone() const;
  void SetSavePath(const base::FilePath& path);
  base::FilePath GetSavePath() const;
-  std::string GetLastModifiedTime() const;
-  std::string GetETag() const;
-  double GetStartTime() const;

 protected:
-  DownloadItem(v8::Isolate* isolate, content::DownloadItem* download_item);
+  explicit DownloadItem(content::DownloadItem* download_item);
  ~DownloadItem();

  // Override content::DownloadItem::Observer methods
--- a/atom/browser/api/atom_api_global_shortcut.cc
+++ b/atom/browser/api/atom_api_global_shortcut.cc
@@ -19,8 +19,7 @@ namespace atom {

 namespace api {

-GlobalShortcut::GlobalShortcut(v8::Isolate* isolate) {
-  Init(isolate);
+GlobalShortcut::GlobalShortcut() {
 }

 GlobalShortcut::~GlobalShortcut() {
@@ -67,22 +66,20 @@ void GlobalShortcut::UnregisterAll() {
  GlobalShortcutListener::GetInstance()->UnregisterAccelerators(this);
 }

-// static
-mate::Handle<GlobalShortcut> GlobalShortcut::Create(v8::Isolate* isolate) {
-  return mate::CreateHandle(isolate, new GlobalShortcut(isolate));
-}
-
-// static
-void GlobalShortcut::BuildPrototype(
-    v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "GlobalShortcut"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+mate::ObjectTemplateBuilder GlobalShortcut::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
+  return mate::ObjectTemplateBuilder(isolate)
      .SetMethod("register", &GlobalShortcut::Register)
      .SetMethod("isRegistered", &GlobalShortcut::IsRegistered)
      .SetMethod("unregister", &GlobalShortcut::Unregister)
      .SetMethod("unregisterAll", &GlobalShortcut::UnregisterAll);
 }

+// static
+mate::Handle<GlobalShortcut> GlobalShortcut::Create(v8::Isolate* isolate) {
+  return CreateHandle(isolate, new GlobalShortcut);
+}
+
 }  // namespace api

 }  // namespace atom
--- a/atom/browser/api/atom_api_global_shortcut.h
+++ b/atom/browser/api/atom_api_global_shortcut.h
@@ -23,13 +23,14 @@ class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
 public:
  static mate::Handle<GlobalShortcut> Create(v8::Isolate* isolate);

-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
 protected:
-  explicit GlobalShortcut(v8::Isolate* isolate);
+  GlobalShortcut();
  ~GlobalShortcut() override;

+  // mate::Wrappable implementations:
+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate) override;
+
 private:
  typedef std::map<ui::Accelerator, base::Closure> AcceleratorCallbackMap;

--- a/atom/browser/api/atom_api_menu.cc
+++ b/atom/browser/api/atom_api_menu.cc
@@ -19,17 +19,16 @@ namespace atom {

 namespace api {

-Menu::Menu(v8::Isolate* isolate, v8::Local<v8::Object> wrapper)
+Menu::Menu()
    : model_(new AtomMenuModel(this)),
-      parent_(nullptr) {
-  InitWith(isolate, wrapper);
+      parent_(NULL) {
 }

 Menu::~Menu() {
 }

 void Menu::AfterInit(v8::Isolate* isolate) {
-  mate::Dictionary wrappable(isolate, GetWrapper());
+  mate::Dictionary wrappable(isolate, GetWrapper(isolate));
  mate::Dictionary delegate;
  if (!wrappable.Get("delegate", &delegate))
    return;
@@ -54,21 +53,16 @@ bool Menu::IsCommandIdVisible(int command_id) const {
  return is_visible_.Run(command_id);
 }

-bool Menu::GetAcceleratorForCommandIdWithParams(
-    int command_id,
-    bool use_default_accelerator,
-    ui::Accelerator* accelerator) const {
+bool Menu::GetAcceleratorForCommandId(int command_id,
+                                      ui::Accelerator* accelerator) {
  v8::Locker locker(isolate());
  v8::HandleScope handle_scope(isolate());
-  v8::Local<v8::Value> val = get_accelerator_.Run(
-      command_id, use_default_accelerator);
+  v8::Local<v8::Value> val = get_accelerator_.Run(command_id);
  return mate::ConvertFromV8(isolate(), val, accelerator);
 }

-void Menu::ExecuteCommand(int command_id, int flags) {
-  execute_command_.Run(
-      mate::internal::CreateEventFromFlags(isolate(), flags),
-      command_id);
+void Menu::ExecuteCommand(int command_id, int event_flags) {
+  execute_command_.Run(command_id);
 }

 void Menu::MenuWillShow(ui::SimpleMenuModel* source) {
@@ -155,9 +149,8 @@ bool Menu::IsVisibleAt(int index) const {

 // static
 void Menu::BuildPrototype(v8::Isolate* isolate,
-                          v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "Menu"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+                          v8::Local<v8::ObjectTemplate> prototype) {
+  mate::ObjectTemplateBuilder(isolate, prototype)
      .MakeDestroyable()
      .SetMethod("insertItem", &Menu::InsertItemAt)
      .SetMethod("insertCheckItem", &Menu::InsertCheckItemAt)
@@ -186,15 +179,14 @@ void Menu::BuildPrototype(v8::Isolate* isolate,

 namespace {

-using atom::api::Menu;
-
 void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
                v8::Local<v8::Context> context, void* priv) {
+  using atom::api::Menu;
  v8::Isolate* isolate = context->GetIsolate();
-  Menu::SetConstructor(isolate, base::Bind(&Menu::New));
-
+  v8::Local<v8::Function> constructor = mate::CreateConstructor<Menu>(
+      isolate, "Menu", base::Bind(&Menu::Create));
  mate::Dictionary dict(isolate, exports);
-  dict.Set("Menu", Menu::GetConstructor(isolate)->GetFunction());
+  dict.Set("Menu", static_cast<v8::Local<v8::Value>>(constructor));
 #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
@@ -5,13 +5,13 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_MENU_H_
 #define ATOM_BROWSER_API_ATOM_API_MENU_H_

-#include <memory>
 #include <string>

 #include "atom/browser/api/atom_api_window.h"
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/ui/atom_menu_model.h"
 #include "base/callback.h"
+#include "base/memory/scoped_ptr.h"

 namespace atom {

@@ -20,10 +20,10 @@ namespace api {
 class Menu : public mate::TrackableObject<Menu>,
             public AtomMenuModel::Delegate {
 public:
-  static mate::WrappableBase* New(mate::Arguments* args);
+  static mate::Wrappable* Create();

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

 #if defined(OS_MACOSX)
  // Set the global menubar.
@@ -36,7 +36,7 @@ class Menu : public mate::TrackableObject<Menu>,
  AtomMenuModel* model() const { return model_.get(); }

 protected:
-  Menu(v8::Isolate* isolate, v8::Local<v8::Object> wrapper);
+  Menu();
  ~Menu() override;

  // mate::Wrappable:
@@ -46,10 +46,8 @@ class Menu : public mate::TrackableObject<Menu>,
  bool IsCommandIdChecked(int command_id) const override;
  bool IsCommandIdEnabled(int command_id) const override;
  bool IsCommandIdVisible(int command_id) const override;
-  bool GetAcceleratorForCommandIdWithParams(
-      int command_id,
-      bool use_default_accelerator,
-      ui::Accelerator* accelerator) const override;
+  bool GetAcceleratorForCommandId(int command_id,
+                                  ui::Accelerator* accelerator) override;
  void ExecuteCommand(int command_id, int event_flags) override;
  void MenuWillShow(ui::SimpleMenuModel* source) override;

@@ -57,7 +55,7 @@ class Menu : public mate::TrackableObject<Menu>,
                       int x = -1, int y = -1,
                       int positioning_item = 0) = 0;

-  std::unique_ptr<AtomMenuModel> model_;
+  scoped_ptr<AtomMenuModel> model_;
  Menu* parent_;

 private:
@@ -91,8 +89,8 @@ class Menu : public mate::TrackableObject<Menu>,
  base::Callback<bool(int)> is_checked_;
  base::Callback<bool(int)> is_enabled_;
  base::Callback<bool(int)> is_visible_;
-  base::Callback<v8::Local<v8::Value>(int, bool)> get_accelerator_;
-  base::Callback<void(v8::Local<v8::Value>, int)> execute_command_;
+  base::Callback<v8::Local<v8::Value>(int)> get_accelerator_;
+  base::Callback<void(int)> execute_command_;
  base::Callback<void()> menu_will_show_;

  DISALLOW_COPY_AND_ASSIGN(Menu);
--- a/atom/browser/api/atom_api_menu_mac.h
+++ b/atom/browser/api/atom_api_menu_mac.h
@@ -17,9 +17,9 @@ namespace api {

 class MenuMac : public Menu {
 protected:
-  MenuMac(v8::Isolate* isolate, v8::Local<v8::Object> wrapper);
+  MenuMac();

-  void PopupAt(Window* window, int x, int y, int positioning_item) override;
+  void PopupAt(Window* window, int x, int y, int positioning_item = 0) override;

  base::scoped_nsobject<AtomMenuController> menu_controller_;

--- a/atom/browser/api/atom_api_menu_mac.mm
+++ b/atom/browser/api/atom_api_menu_mac.mm
@@ -5,11 +5,8 @@
 #import "atom/browser/api/atom_api_menu_mac.h"

 #include "atom/browser/native_window.h"
-#include "atom/browser/unresponsive_suppressor.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
-#include "brightray/browser/inspectable_web_contents.h"
-#include "brightray/browser/inspectable_web_contents_view.h"
 #include "content/public/browser/web_contents.h"

 #include "atom/common/node_includes.h"
@@ -18,24 +15,21 @@ namespace atom {

 namespace api {

-MenuMac::MenuMac(v8::Isolate* isolate, v8::Local<v8::Object> wrapper)
-    : Menu(isolate, wrapper) {
+MenuMac::MenuMac() {
 }

 void MenuMac::PopupAt(Window* window, int x, int y, int positioning_item) {
  NativeWindow* native_window = window->window();
  if (!native_window)
    return;
-  brightray::InspectableWebContents* web_contents =
-      native_window->inspectable_web_contents();
+  content::WebContents* web_contents = native_window->web_contents();
  if (!web_contents)
    return;

  base::scoped_nsobject<AtomMenuController> menu_controller(
-      [[AtomMenuController alloc] initWithModel:model_.get()
-                          useDefaultAccelerator:NO]);
+      [[AtomMenuController alloc] initWithModel:model_.get()]);
  NSMenu* menu = [menu_controller menu];
-  NSView* view = web_contents->GetView()->GetNativeView();
+  NSView* view = web_contents->GetContentNativeView();

  // Which menu item to show.
  NSMenuItem* item = nil;
@@ -52,26 +46,6 @@ void MenuMac::PopupAt(Window* window, int x, int y, int positioning_item) {
    position = NSMakePoint(x, [view frame].size.height - y);
  }

-  // If no preferred item is specified, try to show all of the menu items.
-  if (!positioning_item) {
-    CGFloat windowBottom = CGRectGetMinY([view window].frame);
-    CGFloat lowestMenuPoint = windowBottom + position.y - [menu size].height;
-    CGFloat screenBottom = CGRectGetMinY([view window].screen.frame);
-    CGFloat distanceFromBottom = lowestMenuPoint - screenBottom;
-    if (distanceFromBottom < 0)
-      position.y = position.y - distanceFromBottom + 4;
-  }
-
-  // Place the menu left of cursor if it is overflowing off right of screen.
-  CGFloat windowLeft = CGRectGetMinX([view window].frame);
-  CGFloat rightmostMenuPoint = windowLeft + position.x + [menu size].width;
-  CGFloat screenRight = CGRectGetMaxX([view window].screen.frame);
-  if (rightmostMenuPoint > screenRight)
-    position.x = position.x - [menu size].width;
-
-  // Don't emit unresponsive event when showing menu.
-  atom::UnresponsiveSuppressor suppressor;
-
  // Show the menu.
  [menu popUpMenuPositioningItem:item atLocation:position inView:view];
 }
@@ -80,8 +54,7 @@ void MenuMac::PopupAt(Window* window, int x, int y, int positioning_item) {
 void Menu::SetApplicationMenu(Menu* base_menu) {
  MenuMac* menu = static_cast<MenuMac*>(base_menu);
  base::scoped_nsobject<AtomMenuController> menu_controller(
-      [[AtomMenuController alloc] initWithModel:menu->model_.get()
-                          useDefaultAccelerator:YES]);
+      [[AtomMenuController alloc] initWithModel:menu->model_.get()]);
  [NSApp setMainMenu:[menu_controller menu]];

  // Ensure the menu_controller_ is destroyed after main menu is set.
@@ -95,8 +68,8 @@ void Menu::SendActionToFirstResponder(const std::string& action) {
 }

 // static
-mate::WrappableBase* Menu::New(mate::Arguments* args) {
-  return new MenuMac(args->isolate(), args->GetThis());
+mate::Wrappable* Menu::Create() {
+  return new MenuMac();
 }

 }  // namespace api
--- a/atom/browser/api/atom_api_menu_views.cc
+++ b/atom/browser/api/atom_api_menu_views.cc
@@ -5,17 +5,15 @@
 #include "atom/browser/api/atom_api_menu_views.h"

 #include "atom/browser/native_window_views.h"
-#include "atom/browser/unresponsive_suppressor.h"
 #include "content/public/browser/render_widget_host_view.h"
-#include "ui/display/screen.h"
+#include "ui/gfx/screen.h"
 #include "ui/views/controls/menu/menu_runner.h"

 namespace atom {

 namespace api {

-MenuViews::MenuViews(v8::Isolate* isolate, v8::Local<v8::Object> wrapper)
-    : Menu(isolate, wrapper) {
+MenuViews::MenuViews() {
 }

 void MenuViews::PopupAt(Window* window, int x, int y, int positioning_item) {
@@ -32,15 +30,12 @@ void MenuViews::PopupAt(Window* window, int x, int y, int positioning_item) {
  // (-1, -1) means showing on mouse location.
  gfx::Point location;
  if (x == -1 || y == -1) {
-    location = display::Screen::GetScreen()->GetCursorScreenPoint();
+    location = gfx::Screen::GetNativeScreen()->GetCursorScreenPoint();
  } else {
    gfx::Point origin = view->GetViewBounds().origin();
    location = gfx::Point(origin.x() + x, origin.y() + y);
  }

-  // Don't emit unresponsive event when showing menu.
-  atom::UnresponsiveSuppressor suppressor;
-
  // Show the menu.
  views::MenuRunner menu_runner(
      model(),
@@ -54,8 +49,8 @@ void MenuViews::PopupAt(Window* window, int x, int y, int positioning_item) {
 }

 // static
-mate::WrappableBase* Menu::New(mate::Arguments* args) {
-  return new MenuViews(args->isolate(), args->GetThis());
+mate::Wrappable* Menu::Create() {
+  return new MenuViews();
 }

 }  // namespace api
--- a/atom/browser/api/atom_api_menu_views.h
+++ b/atom/browser/api/atom_api_menu_views.h
@@ -6,7 +6,7 @@
 #define ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_

 #include "atom/browser/api/atom_api_menu.h"
-#include "ui/display/screen.h"
+#include "ui/gfx/screen.h"

 namespace atom {

@@ -14,10 +14,10 @@ namespace api {

 class MenuViews : public Menu {
 public:
-  MenuViews(v8::Isolate* isolate, v8::Local<v8::Object> wrapper);
+  MenuViews();

 protected:
-  void PopupAt(Window* window, int x, int y, int positioning_item) override;
+  void PopupAt(Window* window, int x, int y, int positioning_item = 0) override;

 private:
  DISALLOW_COPY_AND_ASSIGN(MenuViews);
--- a/atom/browser/api/atom_api_net.cc
+++ b/atom/browser/api/atom_api_net.cc
@@ -1,61 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/atom_api_net.h"
-#include "atom/browser/api/atom_api_url_request.h"
-#include "atom/common/node_includes.h"
-#include "native_mate/dictionary.h"
-
-namespace atom {
-
-namespace api {
-
-Net::Net(v8::Isolate* isolate) {
-  Init(isolate);
-}
-
-Net::~Net() {}
-
-// static
-v8::Local<v8::Value> Net::Create(v8::Isolate* isolate) {
-  return mate::CreateHandle(isolate, new Net(isolate)).ToV8();
-}
-
-// static
-void Net::BuildPrototype(v8::Isolate* isolate,
-                         v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "Net"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetProperty("URLRequest", &Net::URLRequest);
-}
-
-v8::Local<v8::Value> Net::URLRequest(v8::Isolate* isolate) {
-  return URLRequest::GetConstructor(isolate)->GetFunction();
-}
-
-}  // namespace api
-
-}  // namespace atom
-
-namespace {
-
-using atom::api::Net;
-using atom::api::URLRequest;
-
-void Initialize(v8::Local<v8::Object> exports,
-                v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context,
-                void* priv) {
-  v8::Isolate* isolate = context->GetIsolate();
-
-  URLRequest::SetConstructor(isolate, base::Bind(URLRequest::New));
-
-  mate::Dictionary dict(isolate, exports);
-  dict.Set("net", Net::Create(isolate));
-  dict.Set("Net", Net::GetConstructor(isolate)->GetFunction());
-}
-
-}  // namespace
-
-NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_net, Initialize)
--- a/atom/browser/api/atom_api_net.h
+++ b/atom/browser/api/atom_api_net.h
@@ -1,35 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_API_ATOM_API_NET_H_
-#define ATOM_BROWSER_API_ATOM_API_NET_H_
-
-#include "atom/browser/api/event_emitter.h"
-
-namespace atom {
-
-namespace api {
-
-class Net : public mate::EventEmitter<Net> {
- public:
-  static v8::Local<v8::Value> Create(v8::Isolate* isolate);
-
-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
-  v8::Local<v8::Value> URLRequest(v8::Isolate* isolate);
-
- protected:
-  explicit Net(v8::Isolate* isolate);
-  ~Net() override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(Net);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_NET_H_
--- a/atom/browser/api/atom_api_power_monitor.cc
+++ b/atom/browser/api/atom_api_power_monitor.cc
@@ -5,19 +5,17 @@
 #include "atom/browser/api/atom_api_power_monitor.h"

 #include "atom/browser/browser.h"
+#include "atom/common/node_includes.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 #include "native_mate/dictionary.h"

-#include "atom/common/node_includes.h"
-
 namespace atom {

 namespace api {

-PowerMonitor::PowerMonitor(v8::Isolate* isolate) {
+PowerMonitor::PowerMonitor() {
  base::PowerMonitor::Get()->AddObserver(this);
-  Init(isolate);
 }

 PowerMonitor::~PowerMonitor() {
@@ -44,17 +42,11 @@ v8::Local<v8::Value> PowerMonitor::Create(v8::Isolate* isolate) {
  if (!Browser::Get()->is_ready()) {
    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
        isolate,
-        "Cannot require \"powerMonitor\" module before app is ready")));
+        "Cannot initialize \"power-monitor\" module before app is ready")));
    return v8::Null(isolate);
  }

-  return mate::CreateHandle(isolate, new PowerMonitor(isolate)).ToV8();
-}
-
-// static
-void PowerMonitor::BuildPrototype(
-    v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "PowerMonitor"));
+  return CreateHandle(isolate, new PowerMonitor).ToV8();
 }

 }  // namespace api
@@ -64,19 +56,16 @@ void PowerMonitor::BuildPrototype(

 namespace {

-using atom::api::PowerMonitor;
-
 void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
                v8::Local<v8::Context> context, void* priv) {
 #if defined(OS_MACOSX)
  base::PowerMonitorDeviceSource::AllocateSystemIOPorts();
 #endif

+  using atom::api::PowerMonitor;
  v8::Isolate* isolate = context->GetIsolate();
  mate::Dictionary dict(isolate, exports);
  dict.Set("powerMonitor", PowerMonitor::Create(isolate));
-  dict.Set("PowerMonitor",
-           PowerMonitor::GetConstructor(isolate)->GetFunction());
 }

 }  // namespace
--- a/atom/browser/api/atom_api_power_monitor.h
+++ b/atom/browser/api/atom_api_power_monitor.h
@@ -19,11 +19,8 @@ class PowerMonitor : public mate::TrackableObject<PowerMonitor>,
 public:
  static v8::Local<v8::Value> Create(v8::Isolate* isolate);

-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
 protected:
-  explicit PowerMonitor(v8::Isolate* isolate);
+  PowerMonitor();
  ~PowerMonitor() override;

  // base::PowerObserver implementations:
--- a/atom/browser/api/atom_api_power_save_blocker.cc
+++ b/atom/browser/api/atom_api_power_save_blocker.cc
@@ -6,19 +6,18 @@

 #include <string>

-#include "content/public/browser/browser_thread.h"
-#include "native_mate/dictionary.h"
-
 #include "atom/common/node_includes.h"
+#include "content/public/browser/power_save_blocker.h"
+#include "native_mate/dictionary.h"

 namespace mate {

 template<>
-struct Converter<device::PowerSaveBlocker::PowerSaveBlockerType> {
+struct Converter<content::PowerSaveBlocker::PowerSaveBlockerType> {
  static bool FromV8(v8::Isolate* isolate,
                     v8::Local<v8::Value> val,
-                     device::PowerSaveBlocker::PowerSaveBlockerType* out) {
-    using device::PowerSaveBlocker;
+                     content::PowerSaveBlocker::PowerSaveBlockerType* out) {
+    using content::PowerSaveBlocker;
    std::string type;
    if (!ConvertFromV8(isolate, val, &type))
      return false;
@@ -38,10 +37,9 @@ namespace atom {

 namespace api {

-PowerSaveBlocker::PowerSaveBlocker(v8::Isolate* isolate)
+PowerSaveBlocker::PowerSaveBlocker()
    : current_blocker_type_(
-          device::PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension) {
-  Init(isolate);
+        content::PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension) {
 }

 PowerSaveBlocker::~PowerSaveBlocker() {
@@ -59,34 +57,30 @@ void PowerSaveBlocker::UpdatePowerSaveBlocker() {
  // higher precedence level than |kPowerSaveBlockPreventAppSuspension|.
  //
  // Only the highest-precedence blocker type takes effect.
-  device::PowerSaveBlocker::PowerSaveBlockerType new_blocker_type =
-      device::PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension;
+  content::PowerSaveBlocker::PowerSaveBlockerType new_blocker_type =
+      content::PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension;
  for (const auto& element : power_save_blocker_types_) {
    if (element.second ==
-        device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep) {
+        content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep) {
      new_blocker_type =
-          device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep;
+          content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep;
      break;
    }
  }

  if (!power_save_blocker_ || new_blocker_type != current_blocker_type_) {
-    std::unique_ptr<device::PowerSaveBlocker> new_blocker(
-        new device::PowerSaveBlocker(
+    scoped_ptr<content::PowerSaveBlocker> new_blocker =
+        content::PowerSaveBlocker::Create(
            new_blocker_type,
-            device::PowerSaveBlocker::kReasonOther,
-            ATOM_PRODUCT_NAME,
-            content::BrowserThread::GetMessageLoopProxyForThread(
-                content::BrowserThread::UI),
-            content::BrowserThread::GetMessageLoopProxyForThread(
-                content::BrowserThread::FILE)));
+            content::PowerSaveBlocker::kReasonOther,
+            ATOM_PRODUCT_NAME);
    power_save_blocker_.swap(new_blocker);
    current_blocker_type_ = new_blocker_type;
  }
 }

 int PowerSaveBlocker::Start(
-    device::PowerSaveBlocker::PowerSaveBlockerType type) {
+    content::PowerSaveBlocker::PowerSaveBlockerType type) {
  static int count = 0;
  power_save_blocker_types_[count] = type;
  UpdatePowerSaveBlocker();
@@ -103,21 +97,19 @@ bool PowerSaveBlocker::IsStarted(int id) {
  return power_save_blocker_types_.find(id) != power_save_blocker_types_.end();
 }

-// static
-mate::Handle<PowerSaveBlocker> PowerSaveBlocker::Create(v8::Isolate* isolate) {
-  return mate::CreateHandle(isolate, new PowerSaveBlocker(isolate));
-}
-
-// static
-void PowerSaveBlocker::BuildPrototype(
-    v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "PowerSaveBlocker"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+mate::ObjectTemplateBuilder PowerSaveBlocker::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
+  return mate::ObjectTemplateBuilder(isolate)
      .SetMethod("start", &PowerSaveBlocker::Start)
      .SetMethod("stop", &PowerSaveBlocker::Stop)
      .SetMethod("isStarted", &PowerSaveBlocker::IsStarted);
 }

+// static
+mate::Handle<PowerSaveBlocker> PowerSaveBlocker::Create(v8::Isolate* isolate) {
+  return CreateHandle(isolate, new PowerSaveBlocker);
+}
+
 }  // namespace api

 }  // namespace atom
--- a/atom/browser/api/atom_api_power_save_blocker.h
+++ b/atom/browser/api/atom_api_power_save_blocker.h
@@ -6,10 +6,10 @@
 #define ATOM_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_

 #include <map>
-#include <memory>

 #include "atom/browser/api/trackable_object.h"
-#include "device/power_save_blocker/power_save_blocker.h"
+#include "base/memory/scoped_ptr.h"
+#include "content/public/browser/power_save_blocker.h"
 #include "native_mate/handle.h"

 namespace mate {
@@ -24,27 +24,28 @@ class PowerSaveBlocker : public mate::TrackableObject<PowerSaveBlocker> {
 public:
  static mate::Handle<PowerSaveBlocker> Create(v8::Isolate* isolate);

-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
 protected:
-  explicit PowerSaveBlocker(v8::Isolate* isolate);
+  PowerSaveBlocker();
  ~PowerSaveBlocker() override;

+  // mate::Wrappable implementations:
+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate) override;
+
 private:
  void UpdatePowerSaveBlocker();
-  int Start(device::PowerSaveBlocker::PowerSaveBlockerType type);
+  int Start(content::PowerSaveBlocker::PowerSaveBlockerType type);
  bool Stop(int id);
  bool IsStarted(int id);

-  std::unique_ptr<device::PowerSaveBlocker> power_save_blocker_;
+  scoped_ptr<content::PowerSaveBlocker> power_save_blocker_;

  // Currnet blocker type used by |power_save_blocker_|
-  device::PowerSaveBlocker::PowerSaveBlockerType current_blocker_type_;
+  content::PowerSaveBlocker::PowerSaveBlockerType current_blocker_type_;

  // Map from id to the corresponding blocker type for each request.
  using PowerSaveBlockerTypeMap =
-      std::map<int, device::PowerSaveBlocker::PowerSaveBlockerType>;
+      std::map<int, content::PowerSaveBlocker::PowerSaveBlockerType>;
  PowerSaveBlockerTypeMap 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
@@ -5,21 +5,16 @@
 #include "atom/browser/api/atom_api_protocol.h"

 #include "atom/browser/atom_browser_client.h"
+#include "atom/browser/atom_browser_context.h"
 #include "atom/browser/atom_browser_main_parts.h"
-#include "atom/browser/browser.h"
 #include "atom/browser/net/url_request_async_asar_job.h"
 #include "atom/browser/net/url_request_buffer_job.h"
 #include "atom/browser/net/url_request_fetch_job.h"
 #include "atom/browser/net/url_request_string_job.h"
 #include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/native_mate_converters/net_converter.h"
 #include "atom/common/node_includes.h"
-#include "atom/common/options_switches.h"
-#include "base/command_line.h"
-#include "base/strings/string_util.h"
-#include "content/public/browser/child_process_security_policy.h"
 #include "native_mate/dictionary.h"
-#include "url/url_util.h"

 using content::BrowserThread;

@@ -27,162 +22,16 @@ namespace atom {

 namespace api {

-namespace {
-
-// List of registered custom standard schemes.
-std::vector<std::string> g_standard_schemes;
-
-// Clear protocol handlers in IO thread.
-void ClearJobFactoryInIO(
-    scoped_refptr<brightray::URLRequestContextGetter> request_context_getter) {
-  auto job_factory = static_cast<AtomURLRequestJobFactory*>(
-      request_context_getter->job_factory());
-  job_factory->Clear();
-}
-
-}  // namespace
-
-std::vector<std::string> GetStandardSchemes() {
-  return g_standard_schemes;
-}
-
-void RegisterStandardSchemes(const std::vector<std::string>& schemes) {
-  g_standard_schemes = schemes;
-
-  auto* policy = content::ChildProcessSecurityPolicy::GetInstance();
-  for (const std::string& scheme : schemes) {
-    url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT);
-    policy->RegisterWebSafeScheme(scheme);
-  }
-
-  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      atom::switches::kStandardSchemes, base::JoinString(schemes, ","));
-}
-
-Protocol::Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context)
+Protocol::Protocol(AtomBrowserContext* browser_context)
    : request_context_getter_(browser_context->GetRequestContext()),
-      weak_factory_(this) {
-  Init(isolate);
+      job_factory_(browser_context->job_factory()) {
+  CHECK(job_factory_);
 }

-Protocol::~Protocol() {
-  content::BrowserThread::PostTask(
-      content::BrowserThread::IO, FROM_HERE,
-      base::Bind(ClearJobFactoryInIO, request_context_getter_));
-}
-
-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);
-  content::BrowserThread::PostTaskAndReplyWithResult(
-      content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&Protocol::UnregisterProtocolInIO,
-                 request_context_getter_, scheme),
-      base::Bind(&Protocol::OnIOCompleted,
-                 GetWeakPtr(), callback));
-}
-
-// static
-Protocol::ProtocolError Protocol::UnregisterProtocolInIO(
-    scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
-    const std::string& scheme) {
-  auto job_factory = static_cast<AtomURLRequestJobFactory*>(
-      request_context_getter->job_factory());
-  if (!job_factory->HasProtocolHandler(scheme))
-    return PROTOCOL_NOT_REGISTERED;
-  job_factory->SetProtocolHandler(scheme, nullptr);
-  return PROTOCOL_OK;
-}
-
-void Protocol::IsProtocolHandled(const std::string& scheme,
-                                 const BooleanCallback& callback) {
-  content::BrowserThread::PostTaskAndReplyWithResult(
-      content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&Protocol::IsProtocolHandledInIO,
-                 request_context_getter_, scheme),
-      callback);
-}
-
-// static
-bool Protocol::IsProtocolHandledInIO(
-    scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
-    const std::string& scheme) {
-  return request_context_getter->job_factory()->IsHandledProtocol(scheme);
-}
-
-void Protocol::UninterceptProtocol(
-    const std::string& scheme, mate::Arguments* args) {
-  CompletionCallback callback;
-  args->GetNext(&callback);
-  content::BrowserThread::PostTaskAndReplyWithResult(
-      content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&Protocol::UninterceptProtocolInIO,
-                 request_context_getter_, scheme),
-      base::Bind(&Protocol::OnIOCompleted,
-                 GetWeakPtr(), callback));
-}
-
-// static
-Protocol::ProtocolError Protocol::UninterceptProtocolInIO(
-    scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
-    const std::string& scheme) {
-  return static_cast<AtomURLRequestJobFactory*>(
-      request_context_getter->job_factory())->UninterceptProtocol(scheme) ?
-          PROTOCOL_OK : PROTOCOL_NOT_INTERCEPTED;
-}
-
-void Protocol::OnIOCompleted(
-    const CompletionCallback& callback, ProtocolError error) {
-  // The completion callback is optional.
-  if (callback.is_null())
-    return;
-
-  v8::Locker locker(isolate());
-  v8::HandleScope handle_scope(isolate());
-
-  if (error == PROTOCOL_OK) {
-    callback.Run(v8::Null(isolate()));
-  } else {
-    std::string str = ErrorCodeToString(error);
-    callback.Run(v8::Exception::Error(mate::StringToV8(isolate(), str)));
-  }
-}
-
-std::string Protocol::ErrorCodeToString(ProtocolError error) {
-  switch (error) {
-    case PROTOCOL_FAIL: return "Failed to manipulate protocol factory";
-    case PROTOCOL_REGISTERED: return "The scheme has been registered";
-    case PROTOCOL_NOT_REGISTERED: return "The scheme has not been registered";
-    case PROTOCOL_INTERCEPTED: return "The scheme has been intercepted";
-    case PROTOCOL_NOT_INTERCEPTED: return "The scheme has not been intercepted";
-    default: return "Unexpected error";
-  }
-}
-
-AtomURLRequestJobFactory* Protocol::GetJobFactoryInIO() const {
-  request_context_getter_->GetURLRequestContext();  // Force init.
-  return static_cast<AtomURLRequestJobFactory*>(
-      static_cast<brightray::URLRequestContextGetter*>(
-          request_context_getter_.get())->job_factory());
-}
-
-// static
-mate::Handle<Protocol> Protocol::Create(
-    v8::Isolate* isolate, AtomBrowserContext* browser_context) {
-  return mate::CreateHandle(isolate, new Protocol(isolate, browser_context));
-}
-
-// static
-void Protocol::BuildPrototype(
-    v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "Protocol"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+mate::ObjectTemplateBuilder Protocol::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
+  return mate::ObjectTemplateBuilder(isolate)
+      .SetMethod("registerStandardSchemes", &Protocol::RegisterStandardSchemes)
      .SetMethod("registerServiceWorkerSchemes",
                 &Protocol::RegisterServiceWorkerSchemes)
      .SetMethod("registerStringProtocol",
@@ -206,29 +55,117 @@ void Protocol::BuildPrototype(
      .SetMethod("uninterceptProtocol", &Protocol::UninterceptProtocol);
 }

+void Protocol::RegisterStandardSchemes(
+    const std::vector<std::string>& schemes) {
+  atom::AtomBrowserClient::SetCustomSchemes(schemes);
+}
+
+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);
+  content::BrowserThread::PostTaskAndReplyWithResult(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(&Protocol::UnregisterProtocolInIO,
+                 base::Unretained(this), scheme),
+      base::Bind(&Protocol::OnIOCompleted,
+                 base::Unretained(this), callback));
+}
+
+Protocol::ProtocolError Protocol::UnregisterProtocolInIO(
+    const std::string& scheme) {
+  if (!job_factory_->HasProtocolHandler(scheme))
+    return PROTOCOL_NOT_REGISTERED;
+  job_factory_->SetProtocolHandler(scheme, nullptr);
+  return PROTOCOL_OK;
+}
+
+void Protocol::IsProtocolHandled(const std::string& scheme,
+                                    const BooleanCallback& callback) {
+  content::BrowserThread::PostTaskAndReplyWithResult(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(&Protocol::IsProtocolHandledInIO,
+                 base::Unretained(this), scheme),
+      callback);
+}
+
+bool Protocol::IsProtocolHandledInIO(const std::string& scheme) {
+  return job_factory_->IsHandledProtocol(scheme);
+}
+
+void Protocol::UninterceptProtocol(
+    const std::string& scheme, mate::Arguments* args) {
+  CompletionCallback callback;
+  args->GetNext(&callback);
+  content::BrowserThread::PostTaskAndReplyWithResult(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(&Protocol::UninterceptProtocolInIO,
+                 base::Unretained(this), scheme),
+      base::Bind(&Protocol::OnIOCompleted,
+                 base::Unretained(this), callback));
+}
+
+Protocol::ProtocolError Protocol::UninterceptProtocolInIO(
+    const std::string& scheme) {
+  if (!original_protocols_.contains(scheme))
+    return PROTOCOL_NOT_INTERCEPTED;
+  job_factory_->ReplaceProtocol(scheme,
+                                original_protocols_.take_and_erase(scheme));
+  return PROTOCOL_OK;
+}
+
+void Protocol::OnIOCompleted(
+    const CompletionCallback& callback, ProtocolError error) {
+  // The completion callback is optional.
+  if (callback.is_null())
+    return;
+
+  v8::Locker locker(isolate());
+  v8::HandleScope handle_scope(isolate());
+
+  if (error == PROTOCOL_OK) {
+    callback.Run(v8::Null(isolate()));
+  } else {
+    std::string str = ErrorCodeToString(error);
+    callback.Run(v8::Exception::Error(mate::StringToV8(isolate(), str)));
+  }
+}
+
+std::string Protocol::ErrorCodeToString(ProtocolError error) {
+  switch (error) {
+    case PROTOCOL_FAIL: return "Failed to manipulate protocol factory";
+    case PROTOCOL_REGISTERED: return "The scheme has been registred";
+    case PROTOCOL_NOT_REGISTERED: return "The scheme has not been registred";
+    case PROTOCOL_INTERCEPTED: return "The scheme has been intercepted";
+    case PROTOCOL_NOT_INTERCEPTED: return "The scheme has not been intercepted";
+    default: return "Unexpected error";
+  }
+}
+
+// static
+mate::Handle<Protocol> Protocol::Create(
+    v8::Isolate* isolate, AtomBrowserContext* browser_context) {
+  return mate::CreateHandle(isolate, new Protocol(browser_context));
+}
+
 }  // namespace api

 }  // namespace atom

 namespace {

-void RegisterStandardSchemes(
-    const std::vector<std::string>& schemes, mate::Arguments* args) {
-  if (atom::Browser::Get()->is_ready()) {
-    args->ThrowError("protocol.registerStandardSchemes should be called before "
-                     "app is ready");
-    return;
-  }
-
-  atom::api::RegisterStandardSchemes(schemes);
-}
-
 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.SetMethod("registerStandardSchemes", &RegisterStandardSchemes);
-  dict.SetMethod("getStandardSchemes", &atom::api::GetStandardSchemes);
+  auto browser_context = static_cast<atom::AtomBrowserContext*>(
+      atom::AtomBrowserMainParts::Get()->browser_context());
+  dict.Set("protocol", atom::api::Protocol::Create(isolate, browser_context));
 }

 }  // namespace
--- a/atom/browser/api/atom_api_protocol.h
+++ b/atom/browser/api/atom_api_protocol.h
@@ -5,48 +5,47 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_
 #define ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_

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

-#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 "base/callback.h"
-#include "base/memory/weak_ptr.h"
+#include "base/containers/scoped_ptr_hash_map.h"
 #include "content/public/browser/browser_thread.h"
 #include "native_mate/arguments.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/handle.h"
-#include "net/url_request/url_request_context.h"
+#include "native_mate/wrappable.h"

-namespace base {
-class DictionaryValue;
+namespace net {
+class URLRequest;
+class URLRequestContextGetter;
 }

 namespace atom {

+class AtomBrowserContext;
+class AtomURLRequestJobFactory;
+
 namespace api {

-std::vector<std::string> GetStandardSchemes();
-void RegisterStandardSchemes(const std::vector<std::string>& schemes);
-
-class Protocol : public mate::TrackableObject<Protocol> {
+class Protocol : public mate::Wrappable {
 public:
  using Handler =
-      base::Callback<void(const base::DictionaryValue&, v8::Local<v8::Value>)>;
+      base::Callback<void(const net::URLRequest*, 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);

-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
 protected:
-  Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context);
-  ~Protocol();
+  explicit Protocol(AtomBrowserContext* browser_context);
+
+  // mate::Wrappable implementations:
+  virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate);

 private:
  // Possible errors.
@@ -78,18 +77,21 @@ class Protocol : public mate::TrackableObject<Protocol> {
        net::URLRequest* request,
        net::NetworkDelegate* network_delegate) const override {
      RequestJob* request_job = new RequestJob(request, network_delegate);
-      request_job->SetHandlerInfo(isolate_, request_context_.get(), handler_);
+      request_job->SetHandlerInfo(isolate_, request_context_, handler_);
      return request_job;
    }

   private:
    v8::Isolate* isolate_;
-    scoped_refptr<net::URLRequestContextGetter> request_context_;
+    net::URLRequestContextGetter* request_context_;
    Protocol::Handler handler_;

    DISALLOW_COPY_AND_ASSIGN(CustomProtocolHandler);
  };

+  // Register schemes to standard scheme list.
+  void RegisterStandardSchemes(const std::vector<std::string>& schemes);
+
  // Register schemes that can handle service worker.
  void RegisterServiceWorkerSchemes(const std::vector<std::string>& schemes);

@@ -103,24 +105,19 @@ class Protocol : public mate::TrackableObject<Protocol> {
    content::BrowserThread::PostTaskAndReplyWithResult(
        content::BrowserThread::IO, FROM_HERE,
        base::Bind(&Protocol::RegisterProtocolInIO<RequestJob>,
-                   request_context_getter_, isolate(), scheme, handler),
+                   base::Unretained(this), scheme, handler),
        base::Bind(&Protocol::OnIOCompleted,
-                   GetWeakPtr(), callback));
+                   base::Unretained(this), callback));
  }
  template<typename RequestJob>
-  static ProtocolError RegisterProtocolInIO(
-      scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
-      v8::Isolate* isolate,
-      const std::string& scheme,
-      const Handler& handler) {
-    auto job_factory = static_cast<AtomURLRequestJobFactory*>(
-        request_context_getter->job_factory());
-    if (job_factory->IsHandledProtocol(scheme))
+  ProtocolError RegisterProtocolInIO(const std::string& scheme,
+                                     const Handler& handler) {
+    if (job_factory_->IsHandledProtocol(scheme))
      return PROTOCOL_REGISTERED;
-    std::unique_ptr<CustomProtocolHandler<RequestJob>> protocol_handler(
+    scoped_ptr<CustomProtocolHandler<RequestJob>> protocol_handler(
        new CustomProtocolHandler<RequestJob>(
-            isolate, request_context_getter.get(), handler));
-    if (job_factory->SetProtocolHandler(scheme, std::move(protocol_handler)))
+            isolate(), request_context_getter_, handler));
+    if (job_factory_->SetProtocolHandler(scheme, protocol_handler.Pass()))
      return PROTOCOL_OK;
    else
      return PROTOCOL_FAIL;
@@ -128,16 +125,12 @@ class Protocol : public mate::TrackableObject<Protocol> {

  // Unregister the protocol handler that handles |scheme|.
  void UnregisterProtocol(const std::string& scheme, mate::Arguments* args);
-  static ProtocolError UnregisterProtocolInIO(
-      scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
-      const std::string& scheme);
+  ProtocolError UnregisterProtocolInIO(const std::string& scheme);

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

  // Replace the protocol handler with a new one.
  template<typename RequestJob>
@@ -149,36 +142,32 @@ class Protocol : public mate::TrackableObject<Protocol> {
    content::BrowserThread::PostTaskAndReplyWithResult(
        content::BrowserThread::IO, FROM_HERE,
        base::Bind(&Protocol::InterceptProtocolInIO<RequestJob>,
-                   request_context_getter_, isolate(), scheme, handler),
+                   base::Unretained(this), scheme, handler),
        base::Bind(&Protocol::OnIOCompleted,
-                   GetWeakPtr(), callback));
+                   base::Unretained(this), callback));
  }
  template<typename RequestJob>
-  static ProtocolError InterceptProtocolInIO(
-      scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
-      v8::Isolate* isolate,
-      const std::string& scheme,
-      const Handler& handler) {
-    auto job_factory = static_cast<AtomURLRequestJobFactory*>(
-        request_context_getter->job_factory());
-    if (!job_factory->IsHandledProtocol(scheme))
+  ProtocolError InterceptProtocolInIO(const std::string& scheme,
+                                      const Handler& handler) {
+    if (!job_factory_->IsHandledProtocol(scheme))
      return PROTOCOL_NOT_REGISTERED;
    // It is possible a protocol is handled but can not be intercepted.
-    if (!job_factory->HasProtocolHandler(scheme))
+    if (!job_factory_->HasProtocolHandler(scheme))
      return PROTOCOL_FAIL;
-    std::unique_ptr<CustomProtocolHandler<RequestJob>> protocol_handler(
-        new CustomProtocolHandler<RequestJob>(
-            isolate, request_context_getter.get(), handler));
-    if (!job_factory->InterceptProtocol(scheme, std::move(protocol_handler)))
+    if (ContainsKey(original_protocols_, scheme))
      return PROTOCOL_INTERCEPTED;
+    scoped_ptr<CustomProtocolHandler<RequestJob>> protocol_handler(
+        new CustomProtocolHandler<RequestJob>(
+            isolate(), request_context_getter_, handler));
+    original_protocols_.set(
+        scheme,
+        job_factory_->ReplaceProtocol(scheme, protocol_handler.Pass()));
    return PROTOCOL_OK;
  }

  // Restore the |scheme| to its original protocol handler.
  void UninterceptProtocol(const std::string& scheme, mate::Arguments* args);
-  static ProtocolError UninterceptProtocolInIO(
-      scoped_refptr<brightray::URLRequestContextGetter> request_context_getter,
-      const std::string& scheme);
+  ProtocolError UninterceptProtocolInIO(const std::string& scheme);

  // Convert error code to JS exception and call the callback.
  void OnIOCompleted(const CompletionCallback& callback, ProtocolError error);
@@ -186,14 +175,15 @@ class Protocol : public mate::TrackableObject<Protocol> {
  // Convert error code to string.
  std::string ErrorCodeToString(ProtocolError error);

-  AtomURLRequestJobFactory* GetJobFactoryInIO() const;
+  net::URLRequestContextGetter* request_context_getter_;

-  base::WeakPtr<Protocol> GetWeakPtr() {
-    return weak_factory_.GetWeakPtr();
-  }
+  // Map that stores the original protocols of schemes.
+  using OriginalProtocolsMap = base::ScopedPtrHashMap<
+      std::string,
+      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>>;
+  OriginalProtocolsMap original_protocols_;

-  scoped_refptr<brightray::URLRequestContextGetter> request_context_getter_;
-  base::WeakPtrFactory<Protocol> weak_factory_;
+  AtomURLRequestJobFactory* job_factory_;  // weak ref

  DISALLOW_COPY_AND_ASSIGN(Protocol);
 };
--- a/atom/browser/api/atom_api_render_process_preferences.cc
+++ b/atom/browser/api/atom_api_render_process_preferences.cc
@@ -1,90 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/atom_api_render_process_preferences.h"
-
-#include "atom/browser/api/atom_api_web_contents.h"
-#include "atom/browser/atom_browser_client.h"
-#include "atom/common/native_mate_converters/value_converter.h"
-#include "content/public/browser/render_process_host.h"
-#include "native_mate/dictionary.h"
-#include "native_mate/object_template_builder.h"
-
-#include "atom/common/node_includes.h"
-
-namespace atom {
-
-namespace api {
-
-namespace {
-
-bool IsWebContents(v8::Isolate* isolate, content::RenderProcessHost* process) {
-  content::WebContents* web_contents =
-      static_cast<AtomBrowserClient*>(AtomBrowserClient::Get())->
-          GetWebContentsFromProcessID(process->GetID());
-  if (!web_contents)
-    return false;
-
-  auto api_web_contents = WebContents::CreateFrom(isolate, web_contents);
-  auto type = api_web_contents->GetType();
-  return type == WebContents::Type::BROWSER_WINDOW ||
-         type == WebContents::Type::WEB_VIEW;
-}
-
-}  // namespace
-
-RenderProcessPreferences::RenderProcessPreferences(
-    v8::Isolate* isolate,
-    const atom::RenderProcessPreferences::Predicate& predicate)
-    : preferences_(predicate) {
-  Init(isolate);
-}
-
-RenderProcessPreferences::~RenderProcessPreferences() {
-}
-
-int RenderProcessPreferences::AddEntry(const base::DictionaryValue& entry) {
-  return preferences_.AddEntry(entry);
-}
-
-void RenderProcessPreferences::RemoveEntry(int id) {
-  preferences_.RemoveEntry(id);
-}
-
-// static
-void RenderProcessPreferences::BuildPrototype(
-    v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(
-      mate::StringToV8(isolate, "RenderProcessPreferences"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("addEntry", &RenderProcessPreferences::AddEntry)
-      .SetMethod("removeEntry", &RenderProcessPreferences::RemoveEntry);
-}
-
-// static
-mate::Handle<RenderProcessPreferences>
-RenderProcessPreferences::ForAllWebContents(v8::Isolate* isolate) {
-  return mate::CreateHandle(
-      isolate,
-      new RenderProcessPreferences(isolate,
-                                   base::Bind(&IsWebContents, isolate)));
-}
-
-}  // namespace api
-
-}  // namespace atom
-
-namespace {
-
-void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context, void* priv) {
-  mate::Dictionary dict(context->GetIsolate(), exports);
-  dict.SetMethod("forAllWebContents",
-                 &atom::api::RenderProcessPreferences::ForAllWebContents);
-}
-
-}  // namespace
-
-NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_render_process_preferences,
-                                  Initialize)
--- a/atom/browser/api/atom_api_render_process_preferences.h
+++ b/atom/browser/api/atom_api_render_process_preferences.h
@@ -1,44 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_API_ATOM_API_RENDER_PROCESS_PREFERENCES_H_
-#define ATOM_BROWSER_API_ATOM_API_RENDER_PROCESS_PREFERENCES_H_
-
-#include "atom/browser/render_process_preferences.h"
-#include "native_mate/handle.h"
-#include "native_mate/wrappable.h"
-
-namespace atom {
-
-namespace api {
-
-class RenderProcessPreferences
-    : public mate::Wrappable<RenderProcessPreferences> {
- public:
-  static mate::Handle<RenderProcessPreferences>
-      ForAllWebContents(v8::Isolate* isolate);
-
-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
-  int AddEntry(const base::DictionaryValue& entry);
-  void RemoveEntry(int id);
-
- protected:
-  RenderProcessPreferences(
-      v8::Isolate* isolate,
-      const atom::RenderProcessPreferences::Predicate& predicate);
-  ~RenderProcessPreferences() override;
-
- private:
-  atom::RenderProcessPreferences preferences_;
-
-  DISALLOW_COPY_AND_ASSIGN(RenderProcessPreferences);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_RENDER_PROCESS_PREFERENCES_H_
--- a/atom/browser/api/atom_api_screen.cc
+++ b/atom/browser/api/atom_api_screen.cc
@@ -12,9 +12,7 @@
 #include "base/bind.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
-#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/screen.h"

 #include "atom/common/node_includes.h"

@@ -36,23 +34,22 @@ typename T::iterator FindById(T* container, int id) {
 // Convert the changed_metrics bitmask to string array.
 std::vector<std::string> MetricsToArray(uint32_t metrics) {
  std::vector<std::string> array;
-  if (metrics & display::DisplayObserver::DISPLAY_METRIC_BOUNDS)
+  if (metrics & gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS)
    array.push_back("bounds");
-  if (metrics & display::DisplayObserver::DISPLAY_METRIC_WORK_AREA)
+  if (metrics & gfx::DisplayObserver::DISPLAY_METRIC_WORK_AREA)
    array.push_back("workArea");
-  if (metrics & display::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR)
+  if (metrics & gfx::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR)
    array.push_back("scaleFactor");
-  if (metrics & display::DisplayObserver::DISPLAY_METRIC_ROTATION)
+  if (metrics & gfx::DisplayObserver::DISPLAY_METRIC_ROTATION)
    array.push_back("rotation");
  return array;
 }

 }  // namespace

-Screen::Screen(v8::Isolate* isolate, display::Screen* screen)
-    : screen_(screen) {
+Screen::Screen(gfx::Screen* screen) : screen_(screen) {
+  displays_ = screen_->GetAllDisplays();
  screen_->AddObserver(this);
-  Init(isolate);
 }

 Screen::~Screen() {
@@ -63,64 +60,73 @@ gfx::Point Screen::GetCursorScreenPoint() {
  return screen_->GetCursorScreenPoint();
 }

-display::Display Screen::GetPrimaryDisplay() {
+gfx::Display Screen::GetPrimaryDisplay() {
  return screen_->GetPrimaryDisplay();
 }

-std::vector<display::Display> Screen::GetAllDisplays() {
-  return screen_->GetAllDisplays();
+std::vector<gfx::Display> Screen::GetAllDisplays() {
+  return displays_;
 }

-display::Display Screen::GetDisplayNearestPoint(const gfx::Point& point) {
+gfx::Display Screen::GetDisplayNearestPoint(const gfx::Point& point) {
  return screen_->GetDisplayNearestPoint(point);
 }

-display::Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) {
+gfx::Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) {
  return screen_->GetDisplayMatching(match_rect);
 }

-void Screen::OnDisplayAdded(const display::Display& new_display) {
+void Screen::OnDisplayAdded(const gfx::Display& new_display) {
+  displays_.push_back(new_display);
  Emit("display-added", new_display);
 }

-void Screen::OnDisplayRemoved(const display::Display& old_display) {
+void Screen::OnDisplayRemoved(const gfx::Display& old_display) {
+  auto iter = FindById(&displays_, old_display.id());
+  if (iter == displays_.end())
+    return;
+
+  displays_.erase(iter);
  Emit("display-removed", old_display);
 }

-void Screen::OnDisplayMetricsChanged(const display::Display& display,
+void Screen::OnDisplayMetricsChanged(const gfx::Display& display,
                                     uint32_t changed_metrics) {
+  auto iter = FindById(&displays_, display.id());
+  if (iter == displays_.end())
+    return;
+
+  *iter = display;
  Emit("display-metrics-changed", display, MetricsToArray(changed_metrics));
 }

+mate::ObjectTemplateBuilder Screen::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
+  return mate::ObjectTemplateBuilder(isolate)
+      .SetMethod("getCursorScreenPoint", &Screen::GetCursorScreenPoint)
+      .SetMethod("getPrimaryDisplay", &Screen::GetPrimaryDisplay)
+      .SetMethod("getAllDisplays", &Screen::GetAllDisplays)
+      .SetMethod("getDisplayNearestPoint", &Screen::GetDisplayNearestPoint)
+      .SetMethod("getDisplayMatching", &Screen::GetDisplayMatching);
+}
+
 // static
 v8::Local<v8::Value> Screen::Create(v8::Isolate* isolate) {
  if (!Browser::Get()->is_ready()) {
    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
        isolate,
-        "Cannot require \"screen\" module before app is ready")));
+        "Cannot initialize \"screen\" module before app is ready")));
    return v8::Null(isolate);
  }

-  display::Screen* screen = display::Screen::GetScreen();
+  gfx::Screen* screen = gfx::Screen::GetNativeScreen();
  if (!screen) {
    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
        isolate, "Failed to get screen information")));
    return v8::Null(isolate);
  }

-  return mate::CreateHandle(isolate, new Screen(isolate, screen)).ToV8();
-}
-
-// static
-void Screen::BuildPrototype(
-    v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "Screen"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("getCursorScreenPoint", &Screen::GetCursorScreenPoint)
-      .SetMethod("getPrimaryDisplay", &Screen::GetPrimaryDisplay)
-      .SetMethod("getAllDisplays", &Screen::GetAllDisplays)
-      .SetMethod("getDisplayNearestPoint", &Screen::GetDisplayNearestPoint)
-      .SetMethod("getDisplayMatching", &Screen::GetDisplayMatching);
+  return mate::CreateHandle(isolate, new Screen(screen)).ToV8();
 }

 }  // namespace api
@@ -129,14 +135,10 @@ void Screen::BuildPrototype(

 namespace {

-using atom::api::Screen;
-
 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("screen", Screen::Create(isolate));
-  dict.Set("Screen", Screen::GetConstructor(isolate)->GetFunction());
+  mate::Dictionary dict(context->GetIsolate(), exports);
+  dict.Set("screen", atom::api::Screen::Create(context->GetIsolate()));
 }

 }  // namespace
--- a/atom/browser/api/atom_api_screen.h
+++ b/atom/browser/api/atom_api_screen.h
@@ -9,8 +9,7 @@

 #include "atom/browser/api/event_emitter.h"
 #include "native_mate/handle.h"
-#include "ui/display/display_observer.h"
-#include "ui/display/screen.h"
+#include "ui/gfx/display_observer.h"

 namespace gfx {
 class Point;
@@ -22,32 +21,34 @@ namespace atom {

 namespace api {

-class Screen : public mate::EventEmitter<Screen>,
-               public display::DisplayObserver {
+class Screen : public mate::EventEmitter,
+               public gfx::DisplayObserver {
 public:
  static v8::Local<v8::Value> Create(v8::Isolate* isolate);

-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
 protected:
-  Screen(v8::Isolate* isolate, display::Screen* screen);
-  ~Screen() override;
+  explicit Screen(gfx::Screen* screen);
+  virtual ~Screen();

  gfx::Point GetCursorScreenPoint();
-  display::Display GetPrimaryDisplay();
-  std::vector<display::Display> GetAllDisplays();
-  display::Display GetDisplayNearestPoint(const gfx::Point& point);
-  display::Display GetDisplayMatching(const gfx::Rect& match_rect);
+  gfx::Display GetPrimaryDisplay();
+  std::vector<gfx::Display> GetAllDisplays();
+  gfx::Display GetDisplayNearestPoint(const gfx::Point& point);
+  gfx::Display GetDisplayMatching(const gfx::Rect& match_rect);

-  // display::DisplayObserver:
-  void OnDisplayAdded(const display::Display& new_display) override;
-  void OnDisplayRemoved(const display::Display& old_display) override;
-  void OnDisplayMetricsChanged(const display::Display& display,
+  // gfx::DisplayObserver:
+  void OnDisplayAdded(const gfx::Display& new_display) override;
+  void OnDisplayRemoved(const gfx::Display& old_display) override;
+  void OnDisplayMetricsChanged(const gfx::Display& display,
                               uint32_t changed_metrics) override;

+  // mate::Wrappable:
+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate) override;
+
 private:
-  display::Screen* screen_;
+  gfx::Screen* screen_;
+  std::vector<gfx::Display> displays_;

  DISALLOW_COPY_AND_ASSIGN(Screen);
 };
--- a/atom/browser/api/atom_api_session.cc
+++ b/atom/browser/api/atom_api_session.cc
@@ -4,53 +4,44 @@

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

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

 #include "atom/browser/api/atom_api_cookies.h"
 #include "atom/browser/api/atom_api_download_item.h"
-#include "atom/browser/api/atom_api_protocol.h"
+#include "atom/browser/api/atom_api_web_contents.h"
 #include "atom/browser/api/atom_api_web_request.h"
+#include "atom/browser/api/save_page_handler.h"
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/atom_permission_manager.h"
-#include "atom/browser/browser.h"
 #include "atom/browser/net/atom_cert_verifier.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/content_converter.h"
-#include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
+#include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/net_converter.h"
-#include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/node_includes.h"
 #include "base/files/file_path.h"
-#include "base/guid.h"
+#include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "base/threading/thread_task_runner_handle.h"
+#include "base/thread_task_runner_handle.h"
 #include "brightray/browser/net/devtools_network_conditions.h"
-#include "brightray/browser/net/devtools_network_controller_handle.h"
+#include "brightray/browser/net/devtools_network_controller.h"
 #include "chrome/common/pref_names.h"
-#include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/download_manager_delegate.h"
 #include "content/public/browser/storage_partition.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 #include "net/base/load_flags.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/dns/host_cache.h"
-#include "net/http/http_auth_handler_factory.h"
-#include "net/http/http_auth_preferences.h"
-#include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_service.h"
-#include "net/url_request/static_http_user_agent_settings.h"
+#include "net/proxy/proxy_config_service_fixed.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "ui/base/l10n/l10n_util.h"

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

@@ -58,21 +49,12 @@ namespace {

 struct ClearStorageDataOptions {
  GURL origin;
-  uint32_t storage_types = StoragePartition::REMOVE_DATA_MASK_ALL;
-  uint32_t quota_types = StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL;
+  uint32 storage_types = StoragePartition::REMOVE_DATA_MASK_ALL;
+  uint32 quota_types = StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL;
 };

-struct ClearAuthCacheOptions {
-  std::string type;
-  GURL origin;
-  std::string realm;
-  base::string16 username;
-  base::string16 password;
-  net::HttpAuth::Scheme auth_scheme;
-};
-
-uint32_t GetStorageMask(const std::vector<std::string>& storage_types) {
-  uint32_t storage_mask = 0;
+uint32 GetStorageMask(const std::vector<std::string>& storage_types) {
+  uint32 storage_mask = 0;
  for (const auto& it : storage_types) {
    auto type = base::ToLowerASCII(it);
    if (type == "appcache")
@@ -95,8 +77,8 @@ uint32_t GetStorageMask(const std::vector<std::string>& storage_types) {
  return storage_mask;
 }

-uint32_t GetQuotaMask(const std::vector<std::string>& quota_types) {
-  uint32_t quota_mask = 0;
+uint32 GetQuotaMask(const std::vector<std::string>& quota_types) {
+  uint32 quota_mask = 0;
  for (const auto& it : quota_types) {
    auto type = base::ToLowerASCII(it);
    if (type == "temporary")
@@ -109,27 +91,6 @@ uint32_t GetQuotaMask(const std::vector<std::string>& quota_types) {
  return quota_mask;
 }

-net::HttpAuth::Scheme GetAuthSchemeFromString(const std::string& scheme) {
-  if (scheme == "basic")
-    return net::HttpAuth::AUTH_SCHEME_BASIC;
-  if (scheme == "digest")
-    return net::HttpAuth::AUTH_SCHEME_DIGEST;
-  if (scheme == "ntlm")
-    return net::HttpAuth::AUTH_SCHEME_NTLM;
-  if (scheme == "negotiate")
-    return net::HttpAuth::AUTH_SCHEME_NEGOTIATE;
-  return net::HttpAuth::AUTH_SCHEME_MAX;
-}
-
-void SetUserAgentInIO(scoped_refptr<net::URLRequestContextGetter> getter,
-                      const std::string& accept_lang,
-                      const std::string& user_agent) {
-  getter->GetURLRequestContext()->set_http_user_agent_settings(
-      new net::StaticHttpUserAgentSettings(
-          net::HttpUtil::GenerateAcceptLanguageHeader(accept_lang),
-          user_agent));
-}
-
 }  // namespace

 namespace mate {
@@ -152,32 +113,12 @@ struct Converter<ClearStorageDataOptions> {
  }
 };

-template <>
-struct Converter<ClearAuthCacheOptions> {
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     ClearAuthCacheOptions* out) {
-    mate::Dictionary options;
-    if (!ConvertFromV8(isolate, val, &options))
-      return false;
-    options.Get("type", &out->type);
-    options.Get("origin", &out->origin);
-    options.Get("realm", &out->realm);
-    options.Get("username", &out->username);
-    options.Get("password", &out->password);
-    std::string scheme;
-    if (options.Get("scheme", &scheme))
-      out->auth_scheme = GetAuthSchemeFromString(scheme);
-    return true;
-  }
-};
-
-template <>
+template<>
 struct Converter<net::ProxyConfig> {
  static bool FromV8(v8::Isolate* isolate,
                     v8::Local<v8::Value> val,
                     net::ProxyConfig* out) {
-    std::string proxy_rules, proxy_bypass_rules;
+    std::string proxy_rules;
    GURL pac_url;
    mate::Dictionary options;
    // Fallback to previous API when passed String.
@@ -187,7 +128,6 @@ struct Converter<net::ProxyConfig> {
    } else if (ConvertFromV8(isolate, val, &options)) {
      options.Get("pacScript", &pac_url);
      options.Get("proxyRules", &proxy_rules);
-      options.Get("proxyBypassRules", &proxy_bypass_rules);
    } else {
      return false;
    }
@@ -197,7 +137,6 @@ struct Converter<net::ProxyConfig> {
      out->set_pac_url(pac_url);
    } else {
      out->proxy_rules().ParseFromString(proxy_rules);
-      out->proxy_rules().bypass_rules.ParseFromString(proxy_bypass_rules);
    }
    return true;
  }
@@ -211,10 +150,9 @@ namespace api {

 namespace {

-const char kPersistPrefix[] = "persist:";
-
-// Referenced session objects.
-std::map<uint32_t, v8::Global<v8::Object>> g_sessions;
+// The wrapSession funtion which is implemented in JavaScript
+using WrapSessionCallback = base::Callback<void(v8::Local<v8::Value>)>;
+WrapSessionCallback g_wrap_session;

 class ResolveProxyHelper {
 public:
@@ -224,7 +162,7 @@ class ResolveProxyHelper {
      : callback_(callback),
        original_thread_(base::ThreadTaskRunnerHandle::Get()) {
    scoped_refptr<net::URLRequestContextGetter> context_getter =
-        browser_context->url_request_context_getter();
+        browser_context->GetRequestContext();
    context_getter->GetNetworkTaskRunner()->PostTask(
        FROM_HERE,
        base::Bind(&ResolveProxyHelper::ResolveProxy,
@@ -253,7 +191,7 @@ class ResolveProxyHelper {

    // Start the request.
    int result = proxy_service->ResolveProxy(
-        url, "GET", net::LOAD_NORMAL, &proxy_info_, completion_callback,
+        url, net::LOAD_NORMAL, &proxy_info_, completion_callback,
        &pac_req_, nullptr, net::BoundNetLog());

    // Completed synchronously.
@@ -290,10 +228,10 @@ void OnGetBackend(disk_cache::Backend** backend_ptr,
    } else if (action == Session::CacheAction::STATS) {
      base::StringPairs stats;
      (*backend_ptr)->GetStats(&stats);
-      for (const auto& stat : stats) {
-        if (stat.first == "Current size") {
+      for (size_t i = 0; i < stats.size(); ++i) {
+        if (stats[i].first == "Current size") {
          int current_size;
-          base::StringToInt(stat.second, &current_size);
+          base::StringToInt(stats[i].second, &current_size);
          RunCallbackInUI(callback, current_size);
          break;
        }
@@ -315,7 +253,7 @@ void DoCacheActionInIO(

  // Call GetBackend and make the backend's ptr accessable in OnGetBackend.
  using BackendPtr = disk_cache::Backend*;
-  auto* backend_ptr = new BackendPtr(nullptr);
+  BackendPtr* backend_ptr = new BackendPtr(nullptr);
  net::CompletionCallback on_get_backend =
      base::Bind(&OnGetBackend, base::Owned(backend_ptr), action, callback);
  int rv = http_cache->GetBackend(backend_ptr, on_get_backend);
@@ -327,21 +265,13 @@ void SetProxyInIO(net::URLRequestContextGetter* getter,
                  const net::ProxyConfig& config,
                  const base::Closure& callback) {
  auto proxy_service = getter->GetURLRequestContext()->proxy_service();
-  proxy_service->ResetConfigService(base::WrapUnique(
+  proxy_service->ResetConfigService(make_scoped_ptr(
      new net::ProxyConfigServiceFixed(config)));
  // Refetches and applies the new pac script if provided.
  proxy_service->ForceReloadProxyConfig();
  RunCallbackInUI(callback);
 }

-void SetCertVerifyProcInIO(
-    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
-    const AtomCertVerifier::VerifyProc& proc) {
-  auto request_context = context_getter->GetURLRequestContext();
-  static_cast<AtomCertVerifier*>(request_context->cert_verifier())->
-      SetVerifyProc(proc);
-}
-
 void ClearHostResolverCacheInIO(
    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
    const base::Closure& callback) {
@@ -355,100 +285,31 @@ void ClearHostResolverCacheInIO(
  }
 }

-void ClearAuthCacheInIO(
-    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
-    const ClearAuthCacheOptions& options,
-    const base::Closure& callback) {
-  auto request_context = context_getter->GetURLRequestContext();
-  auto network_session =
-      request_context->http_transaction_factory()->GetSession();
-  if (network_session) {
-    if (options.type == "password") {
-      auto auth_cache = network_session->http_auth_cache();
-      if (!options.origin.is_empty()) {
-        auth_cache->Remove(
-            options.origin, options.realm, options.auth_scheme,
-            net::AuthCredentials(options.username, options.password));
-      } else {
-        auth_cache->Clear();
-      }
-    } else if (options.type == "clientCertificate") {
-      auto client_auth_cache = network_session->ssl_client_auth_cache();
-      client_auth_cache->Remove(net::HostPortPair::FromURL(options.origin));
-    }
-    network_session->CloseAllConnections();
-  }
-  if (!callback.is_null())
-    RunCallbackInUI(callback);
-}
-
-void AllowNTLMCredentialsForDomainsInIO(
-    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
-    const std::string& domains) {
-  auto request_context = context_getter->GetURLRequestContext();
-  auto auth_handler = request_context->http_auth_handler_factory();
-  if (auth_handler) {
-    auto auth_preferences = const_cast<net::HttpAuthPreferences*>(
-        auth_handler->http_auth_preferences());
-    if (auth_preferences)
-      auth_preferences->set_server_whitelist(domains);
-  }
-}
-
-void OnClearStorageDataDone(const base::Closure& callback) {
-  if (!callback.is_null())
-    callback.Run();
-}
-
-void DownloadIdCallback(content::DownloadManager* download_manager,
-                        const base::FilePath& path,
-                        const std::vector<GURL>& url_chain,
-                        const std::string& mime_type,
-                        int64_t offset,
-                        int64_t length,
-                        const std::string& last_modified,
-                        const std::string& etag,
-                        const base::Time& start_time,
-                        uint32_t id) {
-  download_manager->CreateDownloadItem(
-      base::GenerateGUID(), id, path, path, url_chain, GURL(), GURL(), GURL(),
-      GURL(), mime_type, mime_type, start_time, base::Time(), etag,
-      last_modified, offset, length, std::string(),
-      content::DownloadItem::INTERRUPTED,
-      content::DownloadDangerType::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-      content::DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT, false);
-}
-
 }  // namespace

-Session::Session(v8::Isolate* isolate, AtomBrowserContext* browser_context)
-    : devtools_network_emulation_client_id_(base::GenerateGUID()),
-      browser_context_(browser_context) {
-  // Observe DownloadManager to get download notifications.
+Session::Session(AtomBrowserContext* browser_context)
+    : browser_context_(browser_context) {
+  AttachAsUserData(browser_context);
+
+  // Observe DownloadManger to get download notifications.
  content::BrowserContext::GetDownloadManager(browser_context)->
      AddObserver(this);
-
-  Init(isolate);
-  AttachAsUserData(browser_context);
 }

 Session::~Session() {
  content::BrowserContext::GetDownloadManager(browser_context())->
      RemoveObserver(this);
-  g_sessions.erase(weak_map_id());
 }

 void Session::OnDownloadCreated(content::DownloadManager* manager,
                                content::DownloadItem* item) {
-  if (item->IsSavePackageDownload())
+  auto web_contents = item->GetWebContents();
+  if (SavePageHandler::IsSavePageTypes(item->GetMimeType()))
    return;
-
-  v8::Locker locker(isolate());
-  v8::HandleScope handle_scope(isolate());
-  auto handle = DownloadItem::Create(isolate(), item);
-  if (item->GetState() == content::DownloadItem::INTERRUPTED)
-    handle->SetSavePath(item->GetTargetFilePath());
-  bool prevent_default = Emit("will-download", handle, item->GetWebContents());
+  bool prevent_default = Emit(
+      "will-download",
+      DownloadItem::Create(isolate(), item),
+      api::WebContents::CreateFrom(isolate(), web_contents));
  if (prevent_default) {
    item->Cancel(true);
    item->Remove();
@@ -469,19 +330,21 @@ void Session::DoCacheAction(const net::CompletionCallback& callback) {
 }

 void Session::ClearStorageData(mate::Arguments* args) {
-  // clearStorageData([options, callback])
+  // clearStorageData([options, ]callback)
  ClearStorageDataOptions options;
-  base::Closure callback;
  args->GetNext(&options);
-  args->GetNext(&callback);
+  base::Closure callback;
+  if (!args->GetNext(&callback)) {
+    args->ThrowError();
+    return;
+  }

  auto storage_partition =
      content::BrowserContext::GetStoragePartition(browser_context(), nullptr);
  storage_partition->ClearData(
      options.storage_types, options.quota_types, options.origin,
      content::StoragePartition::OriginMatcherFunction(),
-      base::Time(), base::Time::Max(),
-      base::Bind(&OnClearStorageDataDone, callback));
+      base::Time(), base::Time::Max(), callback);
 }

 void Session::FlushStorageData() {
@@ -503,9 +366,9 @@ void Session::SetDownloadPath(const base::FilePath& path) {
 }

 void Session::EnableNetworkEmulation(const mate::Dictionary& options) {
-  std::unique_ptr<brightray::DevToolsNetworkConditions> conditions;
+  scoped_ptr<brightray::DevToolsNetworkConditions> conditions;
  bool offline = false;
-  double latency = 0.0, download_throughput = 0.0, upload_throughput = 0.0;
+  double latency, download_throughput, upload_throughput;
  if (options.Get("offline", &offline) && offline) {
    conditions.reset(new brightray::DevToolsNetworkConditions(offline));
  } else {
@@ -518,19 +381,25 @@ void Session::EnableNetworkEmulation(const mate::Dictionary& options) {
                                                 download_throughput,
                                                 upload_throughput));
  }
+  auto controller = browser_context_->GetDevToolsNetworkController();

-  browser_context_->network_controller_handle()->SetNetworkState(
-      devtools_network_emulation_client_id_, std::move(conditions));
-  browser_context_->network_delegate()->SetDevToolsNetworkEmulationClientId(
-      devtools_network_emulation_client_id_);
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+      base::Bind(&brightray::DevToolsNetworkController::SetNetworkState,
+                 base::Unretained(controller),
+                 std::string(),
+                 base::Passed(&conditions)));
 }

 void Session::DisableNetworkEmulation() {
-  std::unique_ptr<brightray::DevToolsNetworkConditions> conditions;
-  browser_context_->network_controller_handle()->SetNetworkState(
-      devtools_network_emulation_client_id_, std::move(conditions));
-  browser_context_->network_delegate()->SetDevToolsNetworkEmulationClientId(
-      std::string());
+  scoped_ptr<brightray::DevToolsNetworkConditions> conditions(
+      new brightray::DevToolsNetworkConditions(false));
+  auto controller = browser_context_->GetDevToolsNetworkController();
+
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+      base::Bind(&brightray::DevToolsNetworkController::SetNetworkState,
+                 base::Unretained(controller),
+                 std::string(),
+                 base::Passed(&conditions)));
 }

 void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
@@ -541,10 +410,7 @@ void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
    return;
  }

-  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-      base::Bind(&SetCertVerifyProcInIO,
-                 make_scoped_refptr(browser_context_->GetRequestContext()),
-                 proc));
+  browser_context_->cert_verifier()->SetVerifyProc(proc);
 }

 void Session::SetPermissionRequestHandler(v8::Local<v8::Value> val,
@@ -569,108 +435,14 @@ void Session::ClearHostResolverCache(mate::Arguments* args) {
                 callback));
 }

-void Session::ClearAuthCache(mate::Arguments* args) {
-  ClearAuthCacheOptions options;
-  if (!args->GetNext(&options)) {
-    args->ThrowError("Must specify options object");
-    return;
-  }
-  base::Closure callback;
-  args->GetNext(&callback);
-
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&ClearAuthCacheInIO,
-                 make_scoped_refptr(browser_context_->GetRequestContext()),
-                 options, callback));
-}
-
-void Session::AllowNTLMCredentialsForDomains(const std::string& domains) {
-  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-      base::Bind(&AllowNTLMCredentialsForDomainsInIO,
-                 make_scoped_refptr(browser_context_->GetRequestContext()),
-                 domains));
-}
-
-void Session::SetUserAgent(const std::string& user_agent,
-                           mate::Arguments* args) {
-  browser_context_->SetUserAgent(user_agent);
-
-  std::string accept_lang = l10n_util::GetApplicationLocale("");
-  args->GetNext(&accept_lang);
-
-  auto getter = browser_context_->GetRequestContext();
-  getter->GetNetworkTaskRunner()->PostTask(
-      FROM_HERE,
-      base::Bind(&SetUserAgentInIO, getter, accept_lang, user_agent));
-}
-
-std::string Session::GetUserAgent() {
-  return browser_context_->GetUserAgent();
-}
-
-void Session::GetBlobData(
-    const std::string& uuid,
-    const AtomBlobReader::CompletionCallback& callback) {
-  if (callback.is_null())
-    return;
-
-  AtomBlobReader* blob_reader =
-      browser_context()->GetBlobReader();
-  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-      base::Bind(&AtomBlobReader::StartReading,
-                 base::Unretained(blob_reader),
-                 uuid,
-                 callback));
-}
-
-void Session::CreateInterruptedDownload(const mate::Dictionary& options) {
-  int64_t offset = 0, length = 0;
-  double start_time = 0.0;
-  std::string mime_type, last_modified, etag;
-  base::FilePath path;
-  std::vector<GURL> url_chain;
-  options.Get("path", &path);
-  options.Get("urlChain", &url_chain);
-  options.Get("mimeType", &mime_type);
-  options.Get("offset", &offset);
-  options.Get("length", &length);
-  options.Get("lastModified", &last_modified);
-  options.Get("eTag", &etag);
-  options.Get("startTime", &start_time);
-  if (path.empty() || url_chain.empty() || length == 0) {
-    isolate()->ThrowException(v8::Exception::Error(mate::StringToV8(
-        isolate(), "Must pass non-empty path, urlChain and length.")));
-    return;
-  }
-  if (offset >= length) {
-    isolate()->ThrowException(v8::Exception::Error(mate::StringToV8(
-        isolate(), "Must pass an offset value less than length.")));
-    return;
-  }
-  auto download_manager =
-      content::BrowserContext::GetDownloadManager(browser_context());
-  download_manager->GetDelegate()->GetNextId(base::Bind(
-      &DownloadIdCallback, download_manager, path, url_chain, mime_type, offset,
-      length, last_modified, etag, base::Time::FromDoubleT(start_time)));
-}
-
 v8::Local<v8::Value> Session::Cookies(v8::Isolate* isolate) {
  if (cookies_.IsEmpty()) {
-    auto handle = Cookies::Create(isolate, browser_context());
+    auto handle = atom::api::Cookies::Create(isolate, browser_context());
    cookies_.Reset(isolate, handle.ToV8());
  }
  return v8::Local<v8::Value>::New(isolate, cookies_);
 }

-v8::Local<v8::Value> Session::Protocol(v8::Isolate* isolate) {
-  if (protocol_.IsEmpty()) {
-    auto handle = atom::api::Protocol::Create(isolate, browser_context());
-    protocol_.Reset(isolate, handle.ToV8());
-  }
-  return v8::Local<v8::Value>::New(isolate, protocol_);
-}
-
 v8::Local<v8::Value> Session::WebRequest(v8::Isolate* isolate) {
  if (web_request_.IsEmpty()) {
    auto handle = atom::api::WebRequest::Create(isolate, browser_context());
@@ -686,39 +458,23 @@ mate::Handle<Session> Session::CreateFrom(
  if (existing)
    return mate::CreateHandle(isolate, static_cast<Session*>(existing));

-  auto handle = mate::CreateHandle(
-      isolate, new Session(isolate, browser_context));
-
-  // The Sessions should never be garbage collected, since the common pattern is
-  // to use partition strings, instead of using the Session object directly.
-  g_sessions[handle->weak_map_id()] =
-      v8::Global<v8::Object>(isolate, handle.ToV8());
-
+  auto handle = mate::CreateHandle(isolate, new Session(browser_context));
+  g_wrap_session.Run(handle.ToV8());
  return handle;
 }

 // static
 mate::Handle<Session> Session::FromPartition(
-    v8::Isolate* isolate, const std::string& partition,
-    const base::DictionaryValue& options) {
-  scoped_refptr<AtomBrowserContext> browser_context;
-  if (partition.empty()) {
-    browser_context = AtomBrowserContext::From("", false, options);
-  } else if (base::StartsWith(partition, kPersistPrefix,
-                              base::CompareCase::SENSITIVE)) {
-    std::string name = partition.substr(8);
-    browser_context = AtomBrowserContext::From(name, false, options);
-  } else {
-    browser_context = AtomBrowserContext::From(partition, true, options);
-  }
-  return CreateFrom(isolate, browser_context.get());
+    v8::Isolate* isolate, const std::string& partition, bool in_memory) {
+  auto browser_context = brightray::BrowserContext::From(partition, in_memory);
+  return CreateFrom(isolate,
+                    static_cast<AtomBrowserContext*>(browser_context.get()));
 }

 // static
 void Session::BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "Session"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+                             v8::Local<v8::ObjectTemplate> prototype) {
+  mate::ObjectTemplateBuilder(isolate, prototype)
      .MakeDestroyable()
      .SetMethod("resolveProxy", &Session::ResolveProxy)
      .SetMethod("getCacheSize", &Session::DoCacheAction<CacheAction::STATS>)
@@ -733,45 +489,34 @@ void Session::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("setPermissionRequestHandler",
                 &Session::SetPermissionRequestHandler)
      .SetMethod("clearHostResolverCache", &Session::ClearHostResolverCache)
-      .SetMethod("clearAuthCache", &Session::ClearAuthCache)
-      .SetMethod("allowNTLMCredentialsForDomains",
-                 &Session::AllowNTLMCredentialsForDomains)
-      .SetMethod("setUserAgent", &Session::SetUserAgent)
-      .SetMethod("getUserAgent", &Session::GetUserAgent)
-      .SetMethod("getBlobData", &Session::GetBlobData)
-      .SetMethod("createInterruptedDownload",
-                 &Session::CreateInterruptedDownload)
      .SetProperty("cookies", &Session::Cookies)
-      .SetProperty("protocol", &Session::Protocol)
      .SetProperty("webRequest", &Session::WebRequest);
 }

+void ClearWrapSession() {
+  g_wrap_session.Reset();
+}
+
+void SetWrapSession(const WrapSessionCallback& callback) {
+  g_wrap_session = callback;
+
+  // Cleanup the wrapper on exit.
+  atom::AtomBrowserMainParts::Get()->RegisterDestructionCallback(
+      base::Bind(ClearWrapSession));
+}
+
 }  // namespace api

 }  // namespace atom

 namespace {

-using atom::api::Session;
-
-v8::Local<v8::Value> FromPartition(
-    const std::string& partition, mate::Arguments* args) {
-  if (!atom::Browser::Get()->is_ready()) {
-    args->ThrowError("Session can only be received when app is ready");
-    return v8::Null(args->isolate());
-  }
-  base::DictionaryValue options;
-  args->GetNext(&options);
-  return Session::FromPartition(args->isolate(), partition, options).ToV8();
-}
-
 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("Session", Session::GetConstructor(isolate)->GetFunction());
-  dict.Set("Cookies", Cookies::GetConstructor(isolate)->GetFunction());
-  dict.SetMethod("fromPartition", &FromPartition);
+  dict.SetMethod("fromPartition", &atom::api::Session::FromPartition);
+  dict.SetMethod("_setWrapSession", &atom::api::SetWrapSession);
 }

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

 #include "atom/browser/api/trackable_object.h"
-#include "atom/browser/atom_blob_reader.h"
-#include "base/values.h"
 #include "content/public/browser/download_manager.h"
 #include "native_mate/handle.h"
 #include "net/base/completion_callback.h"
@@ -49,18 +47,25 @@ class Session: public mate::TrackableObject<Session>,
  static mate::Handle<Session> CreateFrom(
      v8::Isolate* isolate, AtomBrowserContext* browser_context);

-  // Gets the Session of |partition|.
+  // Gets the Session of |partition| and |in_memory|.
  static mate::Handle<Session> FromPartition(
-      v8::Isolate* isolate, const std::string& partition,
-      const base::DictionaryValue& options = base::DictionaryValue());
+      v8::Isolate* isolate, const std::string& partition, bool in_memory);

  AtomBrowserContext* browser_context() const { return browser_context_.get(); }

  // mate::TrackableObject:
  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
+                             v8::Local<v8::ObjectTemplate> prototype);

-  // Methods.
+ protected:
+  explicit Session(AtomBrowserContext* browser_context);
+  ~Session();
+
+  // content::DownloadManager::Observer:
+  void OnDownloadCreated(content::DownloadManager* manager,
+                         content::DownloadItem* item) override;
+
+ private:
  void ResolveProxy(const GURL& url, ResolveProxyCallback callback);
  template<CacheAction action>
  void DoCacheAction(const net::CompletionCallback& callback);
@@ -74,34 +79,13 @@ class Session: public mate::TrackableObject<Session>,
  void SetPermissionRequestHandler(v8::Local<v8::Value> val,
                                   mate::Arguments* args);
  void ClearHostResolverCache(mate::Arguments* args);
-  void ClearAuthCache(mate::Arguments* args);
-  void AllowNTLMCredentialsForDomains(const std::string& domains);
-  void SetUserAgent(const std::string& user_agent, mate::Arguments* args);
-  std::string GetUserAgent();
-  void GetBlobData(const std::string& uuid,
-                   const AtomBlobReader::CompletionCallback& callback);
-  void CreateInterruptedDownload(const mate::Dictionary& options);
  v8::Local<v8::Value> Cookies(v8::Isolate* isolate);
-  v8::Local<v8::Value> Protocol(v8::Isolate* isolate);
  v8::Local<v8::Value> WebRequest(v8::Isolate* isolate);

- protected:
-  Session(v8::Isolate* isolate, AtomBrowserContext* browser_context);
-  ~Session();
-
-  // content::DownloadManager::Observer:
-  void OnDownloadCreated(content::DownloadManager* manager,
-                         content::DownloadItem* item) override;
-
- private:
  // Cached object.
  v8::Global<v8::Value> cookies_;
-  v8::Global<v8::Value> protocol_;
  v8::Global<v8::Value> web_request_;

-  // The X-DevTools-Emulate-Network-Conditions-Client-Id.
-  std::string devtools_network_emulation_client_id_;
-
  scoped_refptr<AtomBrowserContext> browser_context_;

  DISALLOW_COPY_AND_ASSIGN(Session);
--- a/atom/browser/api/atom_api_system_preferences.cc
+++ b/atom/browser/api/atom_api_system_preferences.cc
@@ -1,98 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/atom_api_system_preferences.h"
-
-#include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/node_includes.h"
-#include "native_mate/dictionary.h"
-#include "ui/gfx/color_utils.h"
-
-namespace atom {
-
-namespace api {
-
-SystemPreferences::SystemPreferences(v8::Isolate* isolate)
-#if defined(OS_WIN)
-    : color_change_listener_(this)
-#endif
-    {
-  Init(isolate);
-#if defined(OS_WIN)
-  InitializeWindow();
-#endif
-}
-
-SystemPreferences::~SystemPreferences() {
-}
-
-#if !defined(OS_MACOSX)
-bool SystemPreferences::IsDarkMode() {
-  return false;
-}
-#endif
-
-bool SystemPreferences::IsInvertedColorScheme() {
-  return color_utils::IsInvertedColorScheme();
-}
-
-// static
-mate::Handle<SystemPreferences> SystemPreferences::Create(
-    v8::Isolate* isolate) {
-  return mate::CreateHandle(isolate, new SystemPreferences(isolate));
-}
-
-// static
-void SystemPreferences::BuildPrototype(
-    v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "SystemPreferences"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-#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("postLocalNotification",
-                 &SystemPreferences::PostLocalNotification)
-      .SetMethod("subscribeNotification",
-                 &SystemPreferences::SubscribeNotification)
-      .SetMethod("unsubscribeNotification",
-                 &SystemPreferences::UnsubscribeNotification)
-      .SetMethod("subscribeLocalNotification",
-                 &SystemPreferences::SubscribeLocalNotification)
-      .SetMethod("unsubscribeLocalNotification",
-                 &SystemPreferences::UnsubscribeLocalNotification)
-      .SetMethod("getUserDefault", &SystemPreferences::GetUserDefault)
-      .SetMethod("setUserDefault", &SystemPreferences::SetUserDefault)
-      .SetMethod("isSwipeTrackingFromScrollEventsEnabled",
-                 &SystemPreferences::IsSwipeTrackingFromScrollEventsEnabled)
-#endif
-      .SetMethod("isInvertedColorScheme",
-                 &SystemPreferences::IsInvertedColorScheme)
-      .SetMethod("isDarkMode", &SystemPreferences::IsDarkMode);
-}
-
-}  // namespace api
-
-}  // namespace atom
-
-namespace {
-
-using atom::api::SystemPreferences;
-
-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("systemPreferences", SystemPreferences::Create(isolate));
-  dict.Set("SystemPreferences",
-           SystemPreferences::GetConstructor(isolate)->GetFunction());
-}
-
-}  // namespace
-
-NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_system_preferences, Initialize);
--- a/atom/browser/api/atom_api_system_preferences.h
+++ b/atom/browser/api/atom_api_system_preferences.h
@@ -1,123 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
-#define ATOM_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
-
-#include <string>
-
-#include "atom/browser/api/event_emitter.h"
-#include "base/callback.h"
-#include "base/values.h"
-#include "native_mate/handle.h"
-
-#if defined(OS_WIN)
-#include "ui/gfx/sys_color_change_listener.h"
-#endif
-
-namespace base {
-class DictionaryValue;
-}
-
-namespace atom {
-
-namespace api {
-
-class SystemPreferences : public mate::EventEmitter<SystemPreferences>
-#if defined(OS_WIN)
-    , public gfx::SysColorChangeListener
-#endif
-  {
- public:
-  static mate::Handle<SystemPreferences> Create(v8::Isolate* isolate);
-
-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
-#if defined(OS_WIN)
-  bool IsAeroGlassEnabled();
-
-  typedef HRESULT (STDAPICALLTYPE *DwmGetColorizationColor)(DWORD *, BOOL *);
-  DwmGetColorizationColor dwmGetColorizationColor =
-    (DwmGetColorizationColor) GetProcAddress(LoadLibraryW(L"dwmapi.dll"),
-                                            "DwmGetColorizationColor");
-
-  std::string GetAccentColor();
-  std::string GetColor(const std::string& color, mate::Arguments* args);
-
-  void InitializeWindow();
-
-  // gfx::SysColorChangeListener:
-  void OnSysColorChange() override;
-
-#elif defined(OS_MACOSX)
-  using NotificationCallback = base::Callback<
-    void(const std::string&, const base::DictionaryValue&)>;
-
-  void PostNotification(const std::string& name,
-                        const base::DictionaryValue& user_info);
-  void PostLocalNotification(const std::string& name,
-                             const base::DictionaryValue& user_info);
-  int SubscribeNotification(const std::string& name,
-                            const NotificationCallback& callback);
-  void UnsubscribeNotification(int id);
-  int SubscribeLocalNotification(const std::string& name,
-                                 const NotificationCallback& callback);
-  void UnsubscribeLocalNotification(int request_id);
-  v8::Local<v8::Value> GetUserDefault(const std::string& name,
-                                      const std::string& type);
-  void SetUserDefault(const std::string& name,
-                      const std::string& type,
-                      mate::Arguments* args);
-  bool IsSwipeTrackingFromScrollEventsEnabled();
-#endif
-  bool IsDarkMode();
-  bool IsInvertedColorScheme();
-
- protected:
-  explicit SystemPreferences(v8::Isolate* isolate);
-  ~SystemPreferences() override;
-
-#if defined(OS_MACOSX)
-  void DoPostNotification(const std::string& name,
-                          const base::DictionaryValue& user_info,
-                          bool is_local);
-  int DoSubscribeNotification(const std::string& name,
-                              const NotificationCallback& callback,
-                              bool is_local);
-  void DoUnsubscribeNotification(int request_id, bool is_local);
-#endif
-
- private:
-#if defined(OS_WIN)
-  // Static callback invoked when a message comes in to our messaging window.
-  static LRESULT CALLBACK
-      WndProcStatic(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
-
-  LRESULT CALLBACK
-      WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
-
-  // The window class of |window_|.
-  ATOM atom_;
-
-  // The handle of the module that contains the window procedure of |window_|.
-  HMODULE instance_;
-
-  // The window used for processing events.
-  HWND window_;
-
-  std::string current_color_;
-
-  bool invertered_color_scheme_;
-
-  gfx::ScopedSysColorChangeListener color_change_listener_;
-#endif
-  DISALLOW_COPY_AND_ASSIGN(SystemPreferences);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
--- a/atom/browser/api/atom_api_system_preferences_mac.mm
+++ b/atom/browser/api/atom_api_system_preferences_mac.mm
@@ -1,244 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/atom_api_system_preferences.h"
-
-#include <map>
-
-#import <Cocoa/Cocoa.h>
-
-#include "atom/browser/mac/dict_util.h"
-#include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/native_mate_converters/gurl_converter.h"
-#include "base/strings/sys_string_conversions.h"
-#include "base/values.h"
-#include "net/base/mac/url_conversions.h"
-
-namespace atom {
-
-namespace api {
-
-namespace {
-
-int g_next_id = 0;
-
-// The map to convert |id| to |int|.
-std::map<int, id> g_id_map;
-
-}  // namespace
-
-void SystemPreferences::PostNotification(const std::string& name,
-    const base::DictionaryValue& user_info) {
-  DoPostNotification(name, user_info, false);
-}
-
-void SystemPreferences::PostLocalNotification(const std::string& name,
-    const base::DictionaryValue& user_info) {
-  DoPostNotification(name, user_info, true);
-}
-
-void SystemPreferences::DoPostNotification(const std::string& name,
-    const base::DictionaryValue& user_info, bool is_local) {
-  NSNotificationCenter* center = is_local ?
-    [NSNotificationCenter defaultCenter] :
-    [NSDistributedNotificationCenter defaultCenter];
-  [center
-     postNotificationName:base::SysUTF8ToNSString(name)
-                   object:nil
-                 userInfo:DictionaryValueToNSDictionary(user_info)
-  ];
-}
-
-int SystemPreferences::SubscribeNotification(
-    const std::string& name, const NotificationCallback& callback) {
-  return DoSubscribeNotification(name, callback, false);
-}
-
-void SystemPreferences::UnsubscribeNotification(int request_id) {
-  DoUnsubscribeNotification(request_id, false);
-}
-
-int SystemPreferences::SubscribeLocalNotification(
-    const std::string& name, const NotificationCallback& callback) {
-  return DoSubscribeNotification(name, callback, true);
-}
-
-void SystemPreferences::UnsubscribeLocalNotification(int request_id) {
-  DoUnsubscribeNotification(request_id, true);
-}
-
-int SystemPreferences::DoSubscribeNotification(const std::string& name,
-  const NotificationCallback& callback, bool is_local) {
-  int request_id = g_next_id++;
-  __block NotificationCallback copied_callback = callback;
-  NSNotificationCenter* center = is_local ?
-    [NSNotificationCenter defaultCenter] :
-    [NSDistributedNotificationCenter defaultCenter];
-
-  g_id_map[request_id] = [center
-    addObserverForName:base::SysUTF8ToNSString(name)
-    object:nil
-    queue:nil
-    usingBlock:^(NSNotification* notification) {
-      std::unique_ptr<base::DictionaryValue> user_info =
-        NSDictionaryToDictionaryValue(notification.userInfo);
-      if (user_info) {
-        copied_callback.Run(
-          base::SysNSStringToUTF8(notification.name),
-          *user_info);
-      } else {
-        copied_callback.Run(
-          base::SysNSStringToUTF8(notification.name),
-          base::DictionaryValue());
-      }
-    }
-  ];
-  return request_id;
-}
-
-void SystemPreferences::DoUnsubscribeNotification(int request_id, bool is_local) {
-  auto iter = g_id_map.find(request_id);
-  if (iter != g_id_map.end()) {
-    id observer = iter->second;
-    NSNotificationCenter* center = is_local ?
-      [NSNotificationCenter defaultCenter] :
-      [NSDistributedNotificationCenter defaultCenter];
-    [center removeObserver:observer];
-    g_id_map.erase(iter);
-  }
-}
-
-v8::Local<v8::Value> SystemPreferences::GetUserDefault(
-    const std::string& name, const std::string& type) {
-  NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
-  NSString* key = base::SysUTF8ToNSString(name);
-  if (type == "string") {
-    return mate::StringToV8(isolate(),
-      base::SysNSStringToUTF8([defaults stringForKey:key]));
-  } else if (type == "boolean") {
-    return v8::Boolean::New(isolate(), [defaults boolForKey:key]);
-  } else if (type == "float") {
-    return v8::Number::New(isolate(), [defaults floatForKey:key]);
-  } else if (type == "integer") {
-    return v8::Integer::New(isolate(), [defaults integerForKey:key]);
-  } else if (type == "double") {
-    return v8::Number::New(isolate(), [defaults doubleForKey:key]);
-  } else if (type == "url") {
-    return mate::ConvertToV8(isolate(),
-      net::GURLWithNSURL([defaults URLForKey:key]));
-  } else if (type == "array") {
-    std::unique_ptr<base::ListValue> list =
-        NSArrayToListValue([defaults arrayForKey:key]);
-    if (list == nullptr)
-      list.reset(new base::ListValue());
-    return mate::ConvertToV8(isolate(), *list);
-  } else if (type == "dictionary") {
-    std::unique_ptr<base::DictionaryValue> dictionary =
-        NSDictionaryToDictionaryValue([defaults dictionaryForKey:key]);
-    if (dictionary == nullptr)
-      dictionary.reset(new base::DictionaryValue());
-    return mate::ConvertToV8(isolate(), *dictionary);
-  } else {
-    return v8::Undefined(isolate());
-  }
-}
-
-void SystemPreferences::SetUserDefault(const std::string& name,
-                                       const std::string& type,
-                                       mate::Arguments* args) {
-  const auto throwConversionError = [&] {
-    args->ThrowError("Unable to convert value to: " + type);
-  };
-
-  NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
-  NSString* key = base::SysUTF8ToNSString(name);
-  if (type == "string") {
-    std::string value;
-    if (!args->GetNext(&value)) {
-      throwConversionError();
-      return;
-    }
-
-    [defaults setObject:base::SysUTF8ToNSString(value) forKey:key];
-  } else if (type == "boolean") {
-    bool value;
-    if (!args->GetNext(&value)) {
-      throwConversionError();
-      return;
-    }
-
-    [defaults setBool:value forKey:key];
-  } else if (type == "float") {
-    float value;
-    if (!args->GetNext(&value)) {
-      throwConversionError();
-      return;
-    }
-
-    [defaults setFloat:value forKey:key];
-  } else if (type == "integer") {
-    int value;
-    if (!args->GetNext(&value)) {
-      throwConversionError();
-      return;
-    }
-
-    [defaults setInteger:value forKey:key];
-  } else if (type == "double") {
-    double value;
-    if (!args->GetNext(&value)) {
-      throwConversionError();
-      return;
-    }
-
-    [defaults setDouble:value forKey:key];
-  } else if (type == "url") {
-    GURL value;
-    if (!args->GetNext(&value)) {
-      throwConversionError();
-      return;
-    }
-
-    if (NSURL* url = net::NSURLWithGURL(value)) {
-      [defaults setURL:url forKey:key];
-    }
-  } else if (type == "array") {
-    base::ListValue value;
-    if (!args->GetNext(&value)) {
-      throwConversionError();
-      return;
-    }
-
-    if (NSArray* array = ListValueToNSArray(value)) {
-      [defaults setObject:array forKey:key];
-    }
-  } else if (type == "dictionary") {
-    base::DictionaryValue value;
-    if (!args->GetNext(&value)) {
-      throwConversionError();
-      return;
-    }
-
-    if (NSDictionary* dict = DictionaryValueToNSDictionary(value)) {
-      [defaults setObject:dict forKey:key];
-    }
-  } else {
-    args->ThrowError("Invalid type: " + type);
-    return;
-  }
-}
-
-bool SystemPreferences::IsDarkMode() {
-  NSString* mode = [[NSUserDefaults standardUserDefaults]
-      stringForKey:@"AppleInterfaceStyle"];
-  return [mode isEqualToString:@"Dark"];
-}
-
-bool SystemPreferences::IsSwipeTrackingFromScrollEventsEnabled() {
-  return [NSEvent isSwipeTrackingFromScrollEventsEnabled];
-}
-
-}  // namespace api
-
-}  // namespace atom
--- a/atom/browser/api/atom_api_system_preferences_win.cc
+++ b/atom/browser/api/atom_api_system_preferences_win.cc
@@ -1,177 +0,0 @@
-// Copyright (c) 2014 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/atom_api_system_preferences.h"
-
-#include "atom/common/color_util.h"
-#include "base/win/wrapped_window_proc.h"
-#include "ui/base/win/shell.h"
-#include "ui/gfx/color_utils.h"
-#include "ui/gfx/win/hwnd_util.h"
-
-namespace atom {
-
-namespace {
-
-const wchar_t kSystemPreferencesWindowClass[] =
-  L"Electron_SystemPreferencesHostWindow";
-
-}  // namespace
-
-namespace api {
-
-bool SystemPreferences::IsAeroGlassEnabled() {
-  return ui::win::IsAeroGlassEnabled();
-}
-
-std::string hexColorDWORDToRGBA(DWORD color) {
-  std::ostringstream stream;
-  stream << std::hex << color;
-  std::string hexColor = stream.str();
-  return hexColor.substr(2) + hexColor.substr(0, 2);
-}
-
-std::string SystemPreferences::GetAccentColor() {
-  DWORD color = 0;
-  BOOL opaque = FALSE;
-
-  if (FAILED(dwmGetColorizationColor(&color, &opaque))) {
-    return "";
-  }
-
-  return hexColorDWORDToRGBA(color);
-}
-
-std::string SystemPreferences::GetColor(const std::string& color,
-                                        mate::Arguments* args) {
-  int id;
-  if (color == "3d-dark-shadow") {
-    id = COLOR_3DDKSHADOW;
-  } else if (color == "3d-face") {
-    id = COLOR_3DFACE;
-  } else if (color == "3d-highlight") {
-    id = COLOR_3DHIGHLIGHT;
-  } else if (color == "3d-light") {
-    id = COLOR_3DLIGHT;
-  } else if (color == "3d-shadow") {
-    id = COLOR_3DSHADOW;
-  } else if (color == "active-border") {
-    id = COLOR_ACTIVEBORDER;
-  } else if (color == "active-caption") {
-    id = COLOR_ACTIVECAPTION;
-  } else if (color == "active-caption-gradient") {
-    id = COLOR_GRADIENTACTIVECAPTION;
-  } else if (color == "app-workspace") {
-    id = COLOR_APPWORKSPACE;
-  } else if (color == "button-text") {
-    id = COLOR_BTNTEXT;
-  } else if (color == "caption-text") {
-    id = COLOR_CAPTIONTEXT;
-  } else if (color == "desktop") {
-    id = COLOR_DESKTOP;
-  } else if (color == "disabled-text") {
-    id = COLOR_GRAYTEXT;
-  } else if (color == "highlight") {
-    id = COLOR_HIGHLIGHT;
-  } else if (color == "highlight-text") {
-    id = COLOR_HIGHLIGHTTEXT;
-  } else if (color == "hotlight") {
-    id = COLOR_HOTLIGHT;
-  } else if (color == "inactive-border") {
-    id = COLOR_INACTIVEBORDER;
-  } else if (color == "inactive-caption") {
-    id = COLOR_INACTIVECAPTION;
-  } else if (color == "inactive-caption-gradient") {
-    id = COLOR_GRADIENTINACTIVECAPTION;
-  } else if (color == "inactive-caption-text") {
-    id = COLOR_INACTIVECAPTIONTEXT;
-  } else if (color == "info-background") {
-    id = COLOR_INFOBK;
-  } else if (color == "info-text") {
-    id = COLOR_INFOTEXT;
-  } else if (color == "menu") {
-    id = COLOR_MENU;
-  } else if (color == "menu-highlight") {
-    id = COLOR_MENUHILIGHT;
-  } else if (color == "menubar") {
-    id = COLOR_MENUBAR;
-  } else if (color == "menu-text") {
-    id = COLOR_MENUTEXT;
-  } else if (color == "scrollbar") {
-    id = COLOR_SCROLLBAR;
-  } else if (color == "window") {
-    id = COLOR_WINDOW;
-  } else if (color == "window-frame") {
-    id = COLOR_WINDOWFRAME;
-  } else if (color == "window-text") {
-    id = COLOR_WINDOWTEXT;
-  } else {
-    args->ThrowError("Unknown color: " + color);
-    return "";
-  }
-
-  return ToRGBHex(color_utils::GetSysSkColor(id));
-}
-
-void SystemPreferences::InitializeWindow() {
-  invertered_color_scheme_ = IsInvertedColorScheme();
-
-  WNDCLASSEX window_class;
-  base::win::InitializeWindowClass(
-      kSystemPreferencesWindowClass,
-      &base::win::WrappedWindowProc<SystemPreferences::WndProcStatic>,
-      0, 0, 0, NULL, NULL, NULL, NULL, NULL,
-      &window_class);
-  instance_ = window_class.hInstance;
-  atom_ = RegisterClassEx(&window_class);
-
-  // Create an offscreen window for receiving broadcast messages for the system
-  // colorization color.  Create a hidden WS_POPUP window instead of an
-  // HWND_MESSAGE window, because only top-level windows such as popups can
-  // receive broadcast messages like "WM_DWMCOLORIZATIONCOLORCHANGED".
-  window_ = CreateWindow(MAKEINTATOM(atom_),
-                         0, WS_POPUP, 0, 0, 0, 0, 0, 0, instance_, 0);
-  gfx::CheckWindowCreated(window_);
-  gfx::SetWindowUserData(window_, this);
-}
-
-LRESULT CALLBACK SystemPreferences::WndProcStatic(HWND hwnd,
-                                              UINT message,
-                                              WPARAM wparam,
-                                              LPARAM lparam) {
-  SystemPreferences* msg_wnd = reinterpret_cast<SystemPreferences*>(
-      GetWindowLongPtr(hwnd, GWLP_USERDATA));
-  if (msg_wnd)
-    return msg_wnd->WndProc(hwnd, message, wparam, lparam);
-  else
-    return ::DefWindowProc(hwnd, message, wparam, lparam);
-}
-
-LRESULT CALLBACK SystemPreferences::WndProc(HWND hwnd,
-                                        UINT message,
-                                        WPARAM wparam,
-                                        LPARAM lparam) {
-  if (message == WM_DWMCOLORIZATIONCOLORCHANGED) {
-    DWORD new_color = (DWORD) wparam;
-    std::string new_color_string = hexColorDWORDToRGBA(new_color);
-    if (new_color_string != current_color_) {
-      Emit("accent-color-changed", hexColorDWORDToRGBA(new_color));
-      current_color_ = new_color_string;
-    }
-  }
-  return ::DefWindowProc(hwnd, message, wparam, lparam);
-}
-
-void SystemPreferences::OnSysColorChange() {
-  bool new_invertered_color_scheme = IsInvertedColorScheme();
-  if (new_invertered_color_scheme != invertered_color_scheme_) {
-    invertered_color_scheme_ = new_invertered_color_scheme;
-    Emit("inverted-color-scheme-changed", new_invertered_color_scheme);
-  }
-  Emit("color-changed");
-}
-
-}  // namespace api
-
-}  // namespace atom
--- a/atom/browser/api/atom_api_tray.cc
+++ b/atom/browser/api/atom_api_tray.cc
@@ -8,92 +8,58 @@

 #include "atom/browser/api/atom_api_menu.h"
 #include "atom/browser/browser.h"
-#include "atom/common/api/atom_api_native_image.h"
+#include "atom/browser/ui/tray_icon.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 "atom/common/node_includes.h"
 #include "native_mate/constructor.h"
 #include "native_mate/dictionary.h"
+#include "ui/events/event_constants.h"
 #include "ui/gfx/image/image.h"

-namespace mate {
-
-template<>
-struct Converter<atom::TrayIcon::HighlightMode> {
-  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-                     atom::TrayIcon::HighlightMode* out) {
-    std::string mode;
-    if (ConvertFromV8(isolate, val, &mode)) {
-      if (mode == "always") {
-        *out = atom::TrayIcon::HighlightMode::ALWAYS;
-        return true;
-      }
-      if (mode == "selection") {
-        *out = atom::TrayIcon::HighlightMode::SELECTION;
-        return true;
-      }
-      if (mode == "never") {
-        *out = atom::TrayIcon::HighlightMode::NEVER;
-        return true;
-      }
-    }
-
-    // Support old boolean parameter
-    // TODO(kevinsawicki): Remove in 2.0, deprecate before then with warnings
-    bool highlight;
-    if (ConvertFromV8(isolate, val, &highlight)) {
-      if (highlight)
-        *out = atom::TrayIcon::HighlightMode::SELECTION;
-      else
-        *out = atom::TrayIcon::HighlightMode::NEVER;
-      return true;
-    }
-
-    return false;
-  }
-};
-}  // namespace mate
-
-
 namespace atom {

 namespace api {

-Tray::Tray(v8::Isolate* isolate, v8::Local<v8::Object> wrapper,
-           mate::Handle<NativeImage> image)
+Tray::Tray(const gfx::Image& image)
    : tray_icon_(TrayIcon::Create()) {
-  SetImage(isolate, image);
+  tray_icon_->SetImage(image);
  tray_icon_->AddObserver(this);
-
-  InitWith(isolate, wrapper);
 }

 Tray::~Tray() {
-  // Destroy the native tray in next tick.
-  base::MessageLoop::current()->DeleteSoon(FROM_HERE, tray_icon_.release());
 }

 // static
-mate::WrappableBase* Tray::New(mate::Handle<NativeImage> image,
-                               mate::Arguments* args) {
+mate::Wrappable* Tray::New(v8::Isolate* isolate, const gfx::Image& image) {
  if (!Browser::Get()->is_ready()) {
-    args->ThrowError("Cannot create Tray before app is ready");
+    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
+        isolate, "Cannot create Tray before app is ready")));
    return nullptr;
  }
-  return new Tray(args->isolate(), args->GetThis(), image);
+  return new Tray(image);
 }

 void Tray::OnClicked(const gfx::Rect& bounds, int modifiers) {
-  EmitWithFlags("click", modifiers, bounds);
+  v8::Locker locker(isolate());
+  v8::HandleScope handle_scope(isolate());
+  EmitCustomEvent("click",
+                  ModifiersToObject(isolate(), modifiers), bounds);
 }

 void Tray::OnDoubleClicked(const gfx::Rect& bounds, int modifiers) {
-  EmitWithFlags("double-click", modifiers, bounds);
+  v8::Locker locker(isolate());
+  v8::HandleScope handle_scope(isolate());
+  EmitCustomEvent("double-click",
+                  ModifiersToObject(isolate(), modifiers), bounds);
 }

 void Tray::OnRightClicked(const gfx::Rect& bounds, int modifiers) {
-  EmitWithFlags("right-click", modifiers, bounds);
+  v8::Locker locker(isolate());
+  v8::HandleScope handle_scope(isolate());
+  EmitCustomEvent("right-click",
+                  ModifiersToObject(isolate(), modifiers), bounds);
 }

 void Tray::OnBalloonShow() {
@@ -116,10 +82,6 @@ void Tray::OnDropFiles(const std::vector<std::string>& files) {
  Emit("drop-files", files);
 }

-void Tray::OnDropText(const std::string& text) {
-  Emit("drop-text", text);
-}
-
 void Tray::OnDragEntered() {
  Emit("drag-enter");
 }
@@ -132,38 +94,29 @@ void Tray::OnDragEnded() {
  Emit("drag-end");
 }

-void Tray::SetImage(v8::Isolate* isolate, mate::Handle<NativeImage> image) {
-#if defined(OS_WIN)
-  tray_icon_->SetImage(image->GetHICON(GetSystemMetrics(SM_CXSMICON)));
-#else
-  tray_icon_->SetImage(image->image());
-#endif
+void Tray::SetImage(mate::Arguments* args, const gfx::Image& image) {
+  tray_icon_->SetImage(image);
 }

-void Tray::SetPressedImage(v8::Isolate* isolate,
-                           mate::Handle<NativeImage> image) {
-#if defined(OS_WIN)
-  tray_icon_->SetPressedImage(image->GetHICON(GetSystemMetrics(SM_CXSMICON)));
-#else
-  tray_icon_->SetPressedImage(image->image());
-#endif
+void Tray::SetPressedImage(mate::Arguments* args, const gfx::Image& image) {
+  tray_icon_->SetPressedImage(image);
 }

-void Tray::SetToolTip(const std::string& tool_tip) {
+void Tray::SetToolTip(mate::Arguments* args, const std::string& tool_tip) {
  tray_icon_->SetToolTip(tool_tip);
 }

-void Tray::SetTitle(const std::string& title) {
+void Tray::SetTitle(mate::Arguments* args, const std::string& title) {
  tray_icon_->SetTitle(title);
 }

-void Tray::SetHighlightMode(TrayIcon::HighlightMode mode) {
-  tray_icon_->SetHighlightMode(mode);
+void Tray::SetHighlightMode(mate::Arguments* args, bool highlight) {
+  tray_icon_->SetHighlightMode(highlight);
 }

 void Tray::DisplayBalloon(mate::Arguments* args,
                          const mate::Dictionary& options) {
-  mate::Handle<NativeImage> icon;
+  gfx::Image icon;
  options.Get("icon", &icon);
  base::string16 title, content;
  if (!options.Get("title", &title) ||
@@ -172,14 +125,7 @@ void Tray::DisplayBalloon(mate::Arguments* args,
    return;
  }

-#if defined(OS_WIN)
-  tray_icon_->DisplayBalloon(
-      icon.IsEmpty() ? NULL : icon->GetHICON(GetSystemMetrics(SM_CXSMICON)),
-      title, content);
-#else
-  tray_icon_->DisplayBalloon(
-      icon.IsEmpty() ? gfx::Image() : icon->image(), title, content);
-#endif
+  tray_icon_->DisplayBalloon(icon, title, content);
 }

 void Tray::PopUpContextMenu(mate::Arguments* args) {
@@ -190,20 +136,24 @@ void Tray::PopUpContextMenu(mate::Arguments* args) {
  tray_icon_->PopUpContextMenu(pos, menu.IsEmpty() ? nullptr : menu->model());
 }

-void Tray::SetContextMenu(v8::Isolate* isolate, mate::Handle<Menu> menu) {
-  menu_.Reset(isolate, menu.ToV8());
+void Tray::SetContextMenu(mate::Arguments* args, Menu* menu) {
  tray_icon_->SetContextMenu(menu->model());
 }

-gfx::Rect Tray::GetBounds() {
-  return tray_icon_->GetBounds();
+v8::Local<v8::Object> Tray::ModifiersToObject(v8::Isolate* isolate,
+                                              int modifiers) {
+  mate::Dictionary obj(isolate, v8::Object::New(isolate));
+  obj.Set("shiftKey", static_cast<bool>(modifiers & ui::EF_SHIFT_DOWN));
+  obj.Set("ctrlKey", static_cast<bool>(modifiers & ui::EF_CONTROL_DOWN));
+  obj.Set("altKey", static_cast<bool>(modifiers & ui::EF_ALT_DOWN));
+  obj.Set("metaKey", static_cast<bool>(modifiers & ui::EF_COMMAND_DOWN));
+  return obj.GetHandle();
 }

 // static
 void Tray::BuildPrototype(v8::Isolate* isolate,
-                          v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "Tray"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+                          v8::Local<v8::ObjectTemplate> prototype) {
+  mate::ObjectTemplateBuilder(isolate, prototype)
      .MakeDestroyable()
      .SetMethod("setImage", &Tray::SetImage)
      .SetMethod("setPressedImage", &Tray::SetPressedImage)
@@ -212,8 +162,7 @@ void Tray::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("setHighlightMode", &Tray::SetHighlightMode)
      .SetMethod("displayBalloon", &Tray::DisplayBalloon)
      .SetMethod("popUpContextMenu", &Tray::PopUpContextMenu)
-      .SetMethod("setContextMenu", &Tray::SetContextMenu)
-      .SetMethod("getBounds", &Tray::GetBounds);
+      .SetMethod("_setContextMenu", &Tray::SetContextMenu);
 }

 }  // namespace api
@@ -223,15 +172,14 @@ void Tray::BuildPrototype(v8::Isolate* isolate,

 namespace {

-using atom::api::Tray;
-
 void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
                v8::Local<v8::Context> context, void* priv) {
+  using atom::api::Tray;
  v8::Isolate* isolate = context->GetIsolate();
-  Tray::SetConstructor(isolate, base::Bind(&Tray::New));
-
+  v8::Local<v8::Function> constructor = mate::CreateConstructor<Tray>(
+      isolate, "Tray", base::Bind(&Tray::New));
  mate::Dictionary dict(isolate, exports);
-  dict.Set("Tray", Tray::GetConstructor(isolate)->GetFunction());
+  dict.Set("Tray", static_cast<v8::Local<v8::Value>>(constructor));
 }

 }  // namespace
--- a/atom/browser/api/atom_api_tray.h
+++ b/atom/browser/api/atom_api_tray.h
@@ -5,14 +5,12 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_TRAY_H_
 #define ATOM_BROWSER_API_ATOM_API_TRAY_H_

-#include <memory>
 #include <string>
 #include <vector>

 #include "atom/browser/api/trackable_object.h"
-#include "atom/browser/ui/tray_icon.h"
 #include "atom/browser/ui/tray_icon_observer.h"
-#include "native_mate/handle.h"
+#include "base/memory/scoped_ptr.h"

 namespace gfx {
 class Image;
@@ -30,20 +28,17 @@ class TrayIcon;
 namespace api {

 class Menu;
-class NativeImage;

 class Tray : public mate::TrackableObject<Tray>,
             public TrayIconObserver {
 public:
-  static mate::WrappableBase* New(mate::Handle<NativeImage> image,
-                                  mate::Arguments* args);
+  static mate::Wrappable* New(v8::Isolate* isolate, const gfx::Image& image);

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

 protected:
-  Tray(v8::Isolate* isolate, v8::Local<v8::Object> wrapper,
-       mate::Handle<NativeImage> image);
+  explicit Tray(const gfx::Image& image);
  ~Tray() override;

  // TrayIconObserver:
@@ -55,24 +50,23 @@ class Tray : public mate::TrackableObject<Tray>,
  void OnBalloonClosed() override;
  void OnDrop() override;
  void OnDropFiles(const std::vector<std::string>& files) override;
-  void OnDropText(const std::string& text) override;
  void OnDragEntered() override;
  void OnDragExited() override;
  void OnDragEnded() override;

-  void SetImage(v8::Isolate* isolate, mate::Handle<NativeImage> image);
-  void SetPressedImage(v8::Isolate* isolate, mate::Handle<NativeImage> image);
-  void SetToolTip(const std::string& tool_tip);
-  void SetTitle(const std::string& title);
-  void SetHighlightMode(TrayIcon::HighlightMode mode);
+  void SetImage(mate::Arguments* args, const gfx::Image& image);
+  void SetPressedImage(mate::Arguments* args, const gfx::Image& image);
+  void SetToolTip(mate::Arguments* args, const std::string& tool_tip);
+  void SetTitle(mate::Arguments* args, const std::string& title);
+  void SetHighlightMode(mate::Arguments* args, bool highlight);
  void DisplayBalloon(mate::Arguments* args, const mate::Dictionary& options);
  void PopUpContextMenu(mate::Arguments* args);
-  void SetContextMenu(v8::Isolate* isolate, mate::Handle<Menu> menu);
-  gfx::Rect GetBounds();
+  void SetContextMenu(mate::Arguments* args, Menu* menu);

 private:
-  v8::Global<v8::Object> menu_;
-  std::unique_ptr<TrayIcon> tray_icon_;
+  v8::Local<v8::Object> ModifiersToObject(v8::Isolate* isolate, int modifiers);
+
+  scoped_ptr<TrayIcon> tray_icon_;

  DISALLOW_COPY_AND_ASSIGN(Tray);
 };
--- a/atom/browser/api/atom_api_url_request.cc
+++ b/atom/browser/api/atom_api_url_request.cc
@@ -1,448 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/atom_api_url_request.h"
-#include <string>
-#include "atom/browser/api/atom_api_session.h"
-#include "atom/browser/net/atom_url_request.h"
-#include "atom/common/api/event_emitter_caller.h"
-#include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/native_mate_converters/net_converter.h"
-#include "atom/common/native_mate_converters/string16_converter.h"
-#include "atom/common/node_includes.h"
-#include "native_mate/dictionary.h"
-
-namespace mate {
-
-template <>
-struct Converter<scoped_refptr<const net::IOBufferWithSize>> {
-  static v8::Local<v8::Value> ToV8(
-      v8::Isolate* isolate,
-      scoped_refptr<const net::IOBufferWithSize> buffer) {
-    return node::Buffer::Copy(isolate, buffer->data(), buffer->size())
-        .ToLocalChecked();
-  }
-
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     scoped_refptr<const net::IOBufferWithSize>* out) {
-    auto size = node::Buffer::Length(val);
-
-    if (size == 0) {
-      // Support conversion from empty buffer. A use case is
-      // a GET request without body.
-      // Since zero-sized IOBuffer(s) are not supported, we set the
-      // out pointer to null.
-      *out = nullptr;
-      return true;
-    }
-    auto data = node::Buffer::Data(val);
-    if (!data) {
-      // This is an error as size is positive but data is null.
-      return false;
-    }
-
-    *out = new net::IOBufferWithSize(size);
-    // We do a deep copy. We could have used Buffer's internal memory
-    // but that is much more complicated to be properly handled.
-    memcpy((*out)->data(), data, size);
-    return true;
-  }
-};
-
-}  // namespace mate
-
-namespace atom {
-namespace api {
-
-template <typename Flags>
-URLRequest::StateBase<Flags>::StateBase(Flags initialState)
-    : state_(initialState) {}
-
-template <typename Flags>
-void URLRequest::StateBase<Flags>::SetFlag(Flags flag) {
-  state_ =
-      static_cast<Flags>(static_cast<int>(state_) | static_cast<int>(flag));
-}
-
-template <typename Flags>
-bool URLRequest::StateBase<Flags>::operator==(Flags flag) const {
-  return state_ == flag;
-}
-
-template <typename Flags>
-bool URLRequest::StateBase<Flags>::IsFlagSet(Flags flag) const {
-  return static_cast<int>(state_) & static_cast<int>(flag);
-}
-
-URLRequest::RequestState::RequestState()
-    : StateBase(RequestStateFlags::kNotStarted) {}
-
-bool URLRequest::RequestState::NotStarted() const {
-  return *this == RequestStateFlags::kNotStarted;
-}
-
-bool URLRequest::RequestState::Started() const {
-  return IsFlagSet(RequestStateFlags::kStarted);
-}
-
-bool URLRequest::RequestState::Finished() const {
-  return IsFlagSet(RequestStateFlags::kFinished);
-}
-
-bool URLRequest::RequestState::Canceled() const {
-  return IsFlagSet(RequestStateFlags::kCanceled);
-}
-
-bool URLRequest::RequestState::Failed() const {
-  return IsFlagSet(RequestStateFlags::kFailed);
-}
-
-bool URLRequest::RequestState::Closed() const {
-  return IsFlagSet(RequestStateFlags::kClosed);
-}
-
-URLRequest::ResponseState::ResponseState()
-    : StateBase(ResponseStateFlags::kNotStarted) {}
-
-bool URLRequest::ResponseState::NotStarted() const {
-  return *this == ResponseStateFlags::kNotStarted;
-}
-
-bool URLRequest::ResponseState::Started() const {
-  return IsFlagSet(ResponseStateFlags::kStarted);
-}
-
-bool URLRequest::ResponseState::Ended() const {
-  return IsFlagSet(ResponseStateFlags::kEnded);
-}
-
-bool URLRequest::ResponseState::Failed() const {
-  return IsFlagSet(ResponseStateFlags::kFailed);
-}
-
-URLRequest::URLRequest(v8::Isolate* isolate, v8::Local<v8::Object> wrapper) {
-  InitWith(isolate, wrapper);
-}
-
-URLRequest::~URLRequest() {
-  // A request has been created in JS, it was not used and then
-  // it got collected, no close event to cleanup, only destructor
-  // is called.
-  if (atom_request_) {
-    atom_request_->Terminate();
-  }
-}
-
-// static
-mate::WrappableBase* URLRequest::New(mate::Arguments* args) {
-  auto isolate = args->isolate();
-  v8::Local<v8::Object> options;
-  args->GetNext(&options);
-  mate::Dictionary dict(isolate, options);
-  std::string method;
-  dict.Get("method", &method);
-  std::string url;
-  dict.Get("url", &url);
-  std::string partition;
-  mate::Handle<api::Session> session;
-  if (dict.Get("session", &session)) {
-  } else if (dict.Get("partition", &partition)) {
-    session = Session::FromPartition(isolate, partition);
-  } else {
-    // Use the default session if not specified.
-    session = Session::FromPartition(isolate, "");
-  }
-  auto browser_context = session->browser_context();
-  auto api_url_request = new URLRequest(args->isolate(), args->GetThis());
-  auto atom_url_request =
-      AtomURLRequest::Create(browser_context, method, url, api_url_request);
-
-  api_url_request->atom_request_ = atom_url_request;
-
-  return api_url_request;
-}
-
-// static
-void URLRequest::BuildPrototype(v8::Isolate* isolate,
-                                v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "URLRequest"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      // Request API
-      .MakeDestroyable()
-      .SetMethod("write", &URLRequest::Write)
-      .SetMethod("cancel", &URLRequest::Cancel)
-      .SetMethod("setExtraHeader", &URLRequest::SetExtraHeader)
-      .SetMethod("removeExtraHeader", &URLRequest::RemoveExtraHeader)
-      .SetMethod("setChunkedUpload", &URLRequest::SetChunkedUpload)
-      .SetMethod("_setLoadFlags", &URLRequest::SetLoadFlags)
-      .SetProperty("notStarted", &URLRequest::NotStarted)
-      .SetProperty("finished", &URLRequest::Finished)
-      // Response APi
-      .SetProperty("statusCode", &URLRequest::StatusCode)
-      .SetProperty("statusMessage", &URLRequest::StatusMessage)
-      .SetProperty("rawResponseHeaders", &URLRequest::RawResponseHeaders)
-      .SetProperty("httpVersionMajor", &URLRequest::ResponseHttpVersionMajor)
-      .SetProperty("httpVersionMinor", &URLRequest::ResponseHttpVersionMinor);
-}
-
-bool URLRequest::NotStarted() const {
-  return request_state_.NotStarted();
-}
-
-bool URLRequest::Finished() const {
-  return request_state_.Finished();
-}
-
-bool URLRequest::Canceled() const {
-  return request_state_.Canceled();
-}
-
-bool URLRequest::Write(scoped_refptr<const net::IOBufferWithSize> buffer,
-                       bool is_last) {
-  if (request_state_.Canceled() || request_state_.Failed() ||
-      request_state_.Finished() || request_state_.Closed()) {
-    return false;
-  }
-
-  if (request_state_.NotStarted()) {
-    request_state_.SetFlag(RequestStateFlags::kStarted);
-    // Pin on first write.
-    Pin();
-  }
-
-  if (is_last) {
-    request_state_.SetFlag(RequestStateFlags::kFinished);
-    EmitRequestEvent(true, "finish");
-  }
-
-  DCHECK(atom_request_);
-  if (atom_request_) {
-    return atom_request_->Write(buffer, is_last);
-  }
-  return false;
-}
-
-void URLRequest::Cancel() {
-  if (request_state_.Canceled() || request_state_.Closed()) {
-    // Cancel only once.
-    return;
-  }
-
-  // Mark as canceled.
-  request_state_.SetFlag(RequestStateFlags::kCanceled);
-
-  DCHECK(atom_request_);
-  if (atom_request_ && request_state_.Started()) {
-    // Really cancel if it was started.
-    atom_request_->Cancel();
-  }
-  EmitRequestEvent(true, "abort");
-
-  if (response_state_.Started() && !response_state_.Ended()) {
-    EmitResponseEvent(true, "aborted");
-  }
-  Close();
-}
-
-bool URLRequest::SetExtraHeader(const std::string& name,
-                                const std::string& value) {
-  // Request state must be in the initial non started state.
-  if (!request_state_.NotStarted()) {
-    // Cannot change headers after send.
-    return false;
-  }
-
-  if (!net::HttpUtil::IsValidHeaderName(name)) {
-    return false;
-  }
-
-  if (!net::HttpUtil::IsValidHeaderValue(value)) {
-    return false;
-  }
-
-  DCHECK(atom_request_);
-  if (atom_request_) {
-    atom_request_->SetExtraHeader(name, value);
-  }
-  return true;
-}
-
-void URLRequest::RemoveExtraHeader(const std::string& name) {
-  // State must be equal to not started.
-  if (!request_state_.NotStarted()) {
-    // Cannot change headers after send.
-    return;
-  }
-  DCHECK(atom_request_);
-  if (atom_request_) {
-    atom_request_->RemoveExtraHeader(name);
-  }
-}
-
-void URLRequest::SetChunkedUpload(bool is_chunked_upload) {
-  // State must be equal to not started.
-  if (!request_state_.NotStarted()) {
-    // Cannot change headers after send.
-    return;
-  }
-  DCHECK(atom_request_);
-  if (atom_request_) {
-    atom_request_->SetChunkedUpload(is_chunked_upload);
-  }
-}
-
-void URLRequest::SetLoadFlags(int flags) {
-  // State must be equal to not started.
-  if (!request_state_.NotStarted()) {
-    // Cannot change load flags after start.
-    return;
-  }
-  DCHECK(atom_request_);
-  if (atom_request_) {
-    atom_request_->SetLoadFlags(flags);
-  }
-}
-
-void URLRequest::OnAuthenticationRequired(
-    scoped_refptr<const net::AuthChallengeInfo> auth_info) {
-  if (request_state_.Canceled() || request_state_.Closed()) {
-    return;
-  }
-
-  DCHECK(atom_request_);
-  if (!atom_request_) {
-    return;
-  }
-
-  Emit("login", auth_info.get(),
-       base::Bind(&AtomURLRequest::PassLoginInformation, atom_request_));
-}
-
-void URLRequest::OnResponseStarted(
-    scoped_refptr<net::HttpResponseHeaders> response_headers) {
-  if (request_state_.Canceled() || request_state_.Failed() ||
-      request_state_.Closed()) {
-    // Don't emit any event after request cancel.
-    return;
-  }
-  response_headers_ = response_headers;
-  response_state_.SetFlag(ResponseStateFlags::kStarted);
-  Emit("response");
-}
-
-void URLRequest::OnResponseData(
-    scoped_refptr<const net::IOBufferWithSize> buffer) {
-  if (request_state_.Canceled() || request_state_.Closed() ||
-      request_state_.Failed() || response_state_.Failed()) {
-    // In case we received an unexpected event from Chromium net,
-    // don't emit any data event after request cancel/error/close.
-    return;
-  }
-  if (!buffer || !buffer->data() || !buffer->size()) {
-    return;
-  }
-  Emit("data", buffer);
-}
-
-void URLRequest::OnResponseCompleted() {
-  if (request_state_.Canceled() || request_state_.Closed() ||
-      request_state_.Failed() || response_state_.Failed()) {
-    // In case we received an unexpected event from Chromium net,
-    // don't emit any data event after request cancel/error/close.
-    return;
-  }
-  response_state_.SetFlag(ResponseStateFlags::kEnded);
-  Emit("end");
-  Close();
-}
-
-void URLRequest::OnError(const std::string& error, bool isRequestError) {
-  auto error_object = v8::Exception::Error(mate::StringToV8(isolate(), error));
-  if (isRequestError) {
-    request_state_.SetFlag(RequestStateFlags::kFailed);
-    EmitRequestEvent(false, "error", error_object);
-  } else {
-    response_state_.SetFlag(ResponseStateFlags::kFailed);
-    EmitResponseEvent(false, "error", error_object);
-  }
-  Close();
-}
-
-int URLRequest::StatusCode() const {
-  if (response_headers_) {
-    return response_headers_->response_code();
-  }
-  return -1;
-}
-
-std::string URLRequest::StatusMessage() const {
-  std::string result;
-  if (response_headers_) {
-    result = response_headers_->GetStatusText();
-  }
-  return result;
-}
-
-net::HttpResponseHeaders* URLRequest::RawResponseHeaders() const {
-  return response_headers_.get();
-}
-
-uint32_t URLRequest::ResponseHttpVersionMajor() const {
-  if (response_headers_) {
-    return response_headers_->GetHttpVersion().major_value();
-  }
-  return 0;
-}
-
-uint32_t URLRequest::ResponseHttpVersionMinor() const {
-  if (response_headers_) {
-    return response_headers_->GetHttpVersion().minor_value();
-  }
-  return 0;
-}
-
-void URLRequest::Close() {
-  if (!request_state_.Closed()) {
-    request_state_.SetFlag(RequestStateFlags::kClosed);
-    if (response_state_.Started()) {
-      // Emit a close event if we really have a response object.
-      EmitResponseEvent(true, "close");
-    }
-    EmitRequestEvent(true, "close");
-  }
-  Unpin();
-  if (atom_request_) {
-    // A request has been created in JS, used and then it ended.
-    // We release unneeded net resources.
-    atom_request_->Terminate();
-  }
-  atom_request_ = nullptr;
-}
-
-void URLRequest::Pin() {
-  if (wrapper_.IsEmpty()) {
-    wrapper_.Reset(isolate(), GetWrapper());
-  }
-}
-
-void URLRequest::Unpin() {
-  wrapper_.Reset();
-}
-
-template <typename... Args>
-void URLRequest::EmitRequestEvent(Args... args) {
-  v8::HandleScope handle_scope(isolate());
-  mate::CustomEmit(isolate(), GetWrapper(), "_emitRequestEvent", args...);
-}
-
-template <typename... Args>
-void URLRequest::EmitResponseEvent(Args... args) {
-  v8::HandleScope handle_scope(isolate());
-  mate::CustomEmit(isolate(), GetWrapper(), "_emitResponseEvent", args...);
-}
-
-}  // namespace api
-
-}  // namespace atom
--- a/atom/browser/api/atom_api_url_request.h
+++ b/atom/browser/api/atom_api_url_request.h
@@ -1,207 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_API_ATOM_API_URL_REQUEST_H_
-#define ATOM_BROWSER_API_ATOM_API_URL_REQUEST_H_
-
-#include <array>
-#include <string>
-#include "atom/browser/api/event_emitter.h"
-#include "atom/browser/api/trackable_object.h"
-#include "base/memory/weak_ptr.h"
-#include "native_mate/dictionary.h"
-#include "native_mate/handle.h"
-#include "native_mate/wrappable_base.h"
-#include "net/base/auth.h"
-#include "net/base/io_buffer.h"
-#include "net/http/http_response_headers.h"
-#include "net/url_request/url_request_context.h"
-
-namespace atom {
-
-class AtomURLRequest;
-
-namespace api {
-
-//
-// The URLRequest class implements the V8 binding between the JavaScript API
-// and Chromium native net library. It is responsible for handling HTTP/HTTPS
-// requests.
-//
-// The current class provides only the binding layer. Two other JavaScript
-// classes (ClientRequest and IncomingMessage) in the net module provide the
-// final API, including some state management and arguments validation.
-//
-// URLRequest's methods fall into two main categories: command and event
-// methods. They are always executed on the Browser's UI thread.
-// Command methods are called directly from JavaScript code via the API defined
-// in BuildPrototype. A command method is generally implemented by forwarding
-// the call to a corresponding method on AtomURLRequest which does the
-// synchronization on the Browser IO thread. The latter then calls into Chromium
-// net library. On the other hand, net library events originate on the IO
-// thread in AtomURLRequest and are synchronized back on the UI thread, then
-// forwarded to a corresponding event method in URLRequest and then to
-// JavaScript via the EmitRequestEvent/EmitResponseEvent helpers.
-//
-// URLRequest lifetime management: we followed the Wrapper/Wrappable pattern
-// defined in native_mate. However, we augment that pattern with a pin/unpin
-// mechanism. The main reason is that we want the JS API to provide a similar
-// lifetime guarantees as the XMLHttpRequest.
-// https://xhr.spec.whatwg.org/#garbage-collection
-//
-// The primary motivation is to not garbage collect a URLInstance as long as the
-// object is emitting network events. For instance, in the following JS code
-//
-// (function() {
-//   let request = new URLRequest(...);
-//   request.on('response', (response)=>{
-//    response.on('data', (data) = > {
-//      console.log(data.toString());
-//    });
-//  });
-// })();
-//
-// we still want data to be logged even if the response/request objects are n
-// more referenced in JavaScript.
-//
-// Binding by simply following the native_mate Wrapper/Wrappable pattern will
-// delete the URLRequest object when the corresponding JS object is collected.
-// The v8 handle is a private member in WrappableBase and it is always weak,
-// there is no way to make it strong without changing native_mate.
-// The solution we implement consists of maintaining some kind of state that
-// prevents collection of JS wrappers as long as the request is emitting network
-// events. At initialization, the object is unpinned. When the request starts,
-// it is pinned. When no more events would be emitted, the object is unpinned
-// and lifetime is again managed by the standard native mate Wrapper/Wrappable
-// pattern.
-//
-// pin/unpin: are implemented by constructing/reseting a V8 strong persistent
-// handle.
-//
-// The URLRequest/AtmURLRequest interaction could have been implemented in a
-// single class. However, it implies that the resulting class lifetime will be
-// managed by two conflicting mechanisms: JavaScript garbage collection and
-// Chromium reference counting. Reasoning about lifetime issues become much
-// more complex.
-//
-// We chose to split the implementation into two classes linked via a
-// reference counted/raw pointers. A URLRequest instance is deleted if it is
-// unpinned and the corresponding JS wrapper object is garbage collected. On the
-// other hand, an AtmURLRequest instance lifetime is totally governed by
-// reference counting.
-//
-class URLRequest : public mate::EventEmitter<URLRequest> {
- public:
-  static mate::WrappableBase* New(mate::Arguments* args);
-
-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
-  // Methods for reporting events into JavaScript.
-  void OnAuthenticationRequired(
-      scoped_refptr<const net::AuthChallengeInfo> auth_info);
-  void OnResponseStarted(
-      scoped_refptr<net::HttpResponseHeaders> response_headers);
-  void OnResponseData(scoped_refptr<const net::IOBufferWithSize> data);
-  void OnResponseCompleted();
-  void OnError(const std::string& error, bool isRequestError);
-
- protected:
-  explicit URLRequest(v8::Isolate* isolate, v8::Local<v8::Object> wrapper);
-  ~URLRequest() override;
-
- private:
-  template <typename Flags>
-  class StateBase {
-   public:
-    void SetFlag(Flags flag);
-
-   protected:
-    explicit StateBase(Flags initialState);
-    bool operator==(Flags flag) const;
-    bool IsFlagSet(Flags flag) const;
-
-   private:
-    Flags state_;
-  };
-
-  enum class RequestStateFlags {
-    kNotStarted = 0x0,
-    kStarted = 0x1,
-    kFinished = 0x2,
-    kCanceled = 0x4,
-    kFailed = 0x8,
-    kClosed = 0x10
-  };
-
-  class RequestState : public StateBase<RequestStateFlags> {
-   public:
-    RequestState();
-    bool NotStarted() const;
-    bool Started() const;
-    bool Finished() const;
-    bool Canceled() const;
-    bool Failed() const;
-    bool Closed() const;
-  };
-
-  enum class ResponseStateFlags {
-    kNotStarted = 0x0,
-    kStarted = 0x1,
-    kEnded = 0x2,
-    kFailed = 0x4
-  };
-
-  class ResponseState : public StateBase<ResponseStateFlags> {
-   public:
-    ResponseState();
-    bool NotStarted() const;
-    bool Started() const;
-    bool Ended() const;
-    bool Canceled() const;
-    bool Failed() const;
-    bool Closed() const;
-  };
-
-  bool NotStarted() const;
-  bool Finished() const;
-  bool Canceled() const;
-  bool Failed() const;
-  bool Write(scoped_refptr<const net::IOBufferWithSize> buffer, bool is_last);
-  void Cancel();
-  bool SetExtraHeader(const std::string& name, const std::string& value);
-  void RemoveExtraHeader(const std::string& name);
-  void SetChunkedUpload(bool is_chunked_upload);
-  void SetLoadFlags(int flags);
-
-  int StatusCode() const;
-  std::string StatusMessage() const;
-  net::HttpResponseHeaders* RawResponseHeaders() const;
-  uint32_t ResponseHttpVersionMajor() const;
-  uint32_t ResponseHttpVersionMinor() const;
-
-  void Close();
-  void Pin();
-  void Unpin();
-  template <typename... Args>
-  void EmitRequestEvent(Args... args);
-  template <typename... Args>
-  void EmitResponseEvent(Args... args);
-
-  scoped_refptr<AtomURLRequest> atom_request_;
-  RequestState request_state_;
-  ResponseState response_state_;
-
-  // Used to implement pin/unpin.
-  v8::Global<v8::Object> wrapper_;
-  scoped_refptr<net::HttpResponseHeaders> response_headers_;
-
-  DISALLOW_COPY_AND_ASSIGN(URLRequest);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_URL_REQUEST_H_
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
--- a/atom/browser/api/atom_api_web_contents.h
+++ b/atom/browser/api/atom_api_web_contents.h
@@ -12,9 +12,9 @@
 #include "atom/browser/api/save_page_handler.h"
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/common_web_contents_delegate.h"
-#include "content/common/cursors/webcursor.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/favicon_url.h"
+#include "content/common/cursors/webcursor.h"
 #include "native_mate/handle.h"
 #include "ui/gfx/image/image.h"

@@ -26,10 +26,6 @@ namespace brightray {
 class InspectableWebContents;
 }

-namespace content {
-class ResourceRequestBodyImpl;
-}
-
 namespace mate {
 class Arguments;
 class Dictionary;
@@ -47,14 +43,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
                    public CommonWebContentsDelegate,
                    public content::WebContentsObserver {
 public:
-  enum Type {
-    BACKGROUND_PAGE,  // A DevTools extension background page.
-    BROWSER_WINDOW,  // Used by BrowserWindow.
-    REMOTE,  // Thin wrap around an existing WebContents.
-    WEB_VIEW,  // Used by <webview>.
-    OFF_SCREEN,  // Used for offscreen rendering
-  };
-
  // For node.js callback function type: function(error, buffer)
  using PrintToPDFCallback =
      base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>)>;
@@ -62,26 +50,18 @@ class WebContents : public mate::TrackableObject<WebContents>,
  // 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);
-
-  int64_t GetID() const;
-  int GetProcessID() const;
-  Type GetType() const;
+  int GetID() const;
  bool Equal(const WebContents* web_contents) const;
  void LoadURL(const GURL& url, const mate::Dictionary& options);
  void DownloadURL(const GURL& url);
  GURL GetURL() const;
  base::string16 GetTitle() const;
  bool IsLoading() const;
-  bool IsLoadingMainFrame() const;
  bool IsWaitingForResponse() const;
  void Stop();
  void ReloadIgnoringCache();
@@ -89,7 +69,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
  void GoForward();
  void GoToOffset(int offset);
  bool IsCrashed() const;
-  void SetUserAgent(const std::string& user_agent, mate::Arguments* args);
+  void SetUserAgent(const std::string& user_agent);
  std::string GetUserAgent();
  void InsertCSS(const std::string& css);
  bool SavePage(const base::FilePath& full_file_path,
@@ -109,7 +89,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
  void SetAudioMuted(bool muted);
  bool IsAudioMuted();
  void Print(mate::Arguments* args);
-  void SetEmbedder(const WebContents* embedder);

  // Print current page as PDF.
  void PrintToPDF(const base::DictionaryValue& setting,
@@ -131,62 +110,35 @@ class WebContents : public mate::TrackableObject<WebContents>,
  void Unselect();
  void Replace(const base::string16& word);
  void ReplaceMisspelling(const base::string16& word);
-  uint32_t FindInPage(mate::Arguments* args);
+  uint32 FindInPage(mate::Arguments* args);
  void StopFindInPage(content::StopFindAction action);
-  void ShowDefinitionForSelection();
-  void CopyImageAt(int x, int y);

  // Focus.
  void Focus();
-  bool IsFocused() const;
  void TabTraverse(bool reverse);

  // Send messages to browser.
-  bool SendIPCMessage(bool all_frames,
-                      const base::string16& channel,
+  bool SendIPCMessage(const base::string16& channel,
                      const base::ListValue& args);

  // Send WebInputEvent to the page.
  void SendInputEvent(v8::Isolate* isolate, v8::Local<v8::Value> input_event);

  // Subscribe to the frame updates.
-  void BeginFrameSubscription(mate::Arguments* args);
+  void BeginFrameSubscription(
+      const FrameSubscriber::FrameCaptureCallback& callback);
  void EndFrameSubscription();

-  // Dragging native items.
-  void StartDrag(const mate::Dictionary& item, mate::Arguments* args);
-
-  // Captures the page with |rect|, |callback| would be called when capturing is
-  // done.
-  void CapturePage(mate::Arguments* args);
-
  // Methods for creating <webview>.
  void SetSize(const SetSizeParams& params);
+  void SetAllowTransparency(bool allow);
  bool IsGuest() const;

-  // Methods for offscreen rendering
-  bool IsOffScreen() const;
-  void OnPaint(const gfx::Rect& dirty_rect, const SkBitmap& bitmap);
-  void StartPainting();
-  void StopPainting();
-  bool IsPainting() const;
-  void SetFrameRate(int frame_rate);
-  int GetFrameRate() const;
-  void Invalidate();
-
  // Callback triggered on permission response.
  void OnEnterFullscreenModeForTab(content::WebContents* source,
                                   const GURL& origin,
                                   bool allowed);

-  // Create window with the given disposition.
-  void OnCreateWindow(
-      const GURL& target_url,
-      const std::string& frame_name,
-      WindowOpenDisposition disposition,
-      const std::vector<base::string16>& features,
-      const scoped_refptr<content::ResourceRequestBodyImpl>& body);
-
  // Returns the web preferences of current WebContents.
  v8::Local<v8::Value> GetWebPreferences(v8::Isolate* isolate);

@@ -194,41 +146,35 @@ class WebContents : public mate::TrackableObject<WebContents>,
  v8::Local<v8::Value> GetOwnerBrowserWindow();

  // Properties.
-  int32_t ID() const;
  v8::Local<v8::Value> Session(v8::Isolate* isolate);
  content::WebContents* HostWebContents();
  v8::Local<v8::Value> DevToolsWebContents(v8::Isolate* isolate);
  v8::Local<v8::Value> Debugger(v8::Isolate* isolate);

+  // mate::TrackableObject:
+  static void BuildPrototype(v8::Isolate* isolate,
+                             v8::Local<v8::ObjectTemplate> prototype);
+
 protected:
-  WebContents(v8::Isolate* isolate,
-              content::WebContents* web_contents,
-              Type type);
+  explicit WebContents(content::WebContents* web_contents);
  WebContents(v8::Isolate* isolate, const mate::Dictionary& options);
  ~WebContents();

-  void InitWithSessionAndOptions(v8::Isolate* isolate,
-                                 content::WebContents *web_contents,
-                                 mate::Handle<class Session> session,
-                                 const mate::Dictionary& options);
-
  // content::WebContentsDelegate:
  bool AddMessageToConsole(content::WebContents* source,
-                           int32_t level,
+                           int32 level,
                           const base::string16& message,
-                           int32_t line_no,
+                           int32 line_no,
                           const base::string16& source_id) override;
-  void WebContentsCreated(content::WebContents* source_contents,
-                          int opener_render_frame_id,
-                          const std::string& frame_name,
-                          const GURL& target_url,
-                          content::WebContents* new_contents) override;
-  void AddNewContents(content::WebContents* source,
-                      content::WebContents* new_contents,
-                      WindowOpenDisposition disposition,
-                      const gfx::Rect& initial_rect,
-                      bool user_gesture,
-                      bool* was_blocked) override;
+  bool ShouldCreateWebContents(
+      content::WebContents* web_contents,
+      int route_id,
+      int main_frame_route_id,
+      WindowContainerType window_container_type,
+      const std::string& frame_name,
+      const GURL& target_url,
+      const std::string& partition_id,
+      content::SessionStorageNamespace* session_storage_namespace) override;
  content::WebContents* OpenURLFromTab(
      content::WebContents* source,
      const content::OpenURLParams& params) override;
@@ -239,7 +185,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
                    const gfx::Rect& pos) override;
  void CloseContents(content::WebContents* source) override;
  void ActivateContents(content::WebContents* contents) override;
-  void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
  bool IsPopupOrPanel(const content::WebContents* source) const override;
  void HandleKeyboardEvent(
      content::WebContents* source,
@@ -269,9 +214,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
      content::WebContents* web_contents,
      bool user_gesture,
      bool last_unlocked_by_target) override;
-  std::unique_ptr<content::BluetoothChooser> RunBluetoothChooser(
-      content::RenderFrameHost* frame,
-      const content::BluetoothChooser::EventHandler& handler) override;

  // content::WebContentsObserver:
  void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
@@ -286,6 +228,11 @@ class WebContents : public mate::TrackableObject<WebContents>,
                   int error_code,
                   const base::string16& error_description,
                   bool was_ignored_by_handler) override;
+  void DidFailProvisionalLoad(content::RenderFrameHost* render_frame_host,
+                              const GURL& validated_url,
+                              int error_code,
+                              const base::string16& error_description,
+                              bool was_ignored_by_handler) override;
  void DidStartLoading() override;
  void DidStopLoading() override;
  void DidGetResourceResponseStart(
@@ -293,8 +240,9 @@ class WebContents : public mate::TrackableObject<WebContents>,
  void DidGetRedirectForResourceRequest(
      content::RenderFrameHost* render_frame_host,
      const content::ResourceRedirectDetails& details) override;
-  void DidFinishNavigation(
-      content::NavigationHandle* navigation_handle) override;
+  void DidNavigateMainFrame(
+      const content::LoadCommittedDetails& details,
+      const content::FrameNavigateParams& params) override;
  bool OnMessageReceived(const IPC::Message& message) override;
  void WebContentsDestroyed() override;
  void NavigationEntryCommitted(
@@ -304,22 +252,25 @@ class WebContents : public mate::TrackableObject<WebContents>,
      const std::vector<content::FaviconURL>& urls) override;
  void PluginCrashed(const base::FilePath& plugin_path,
                     base::ProcessId plugin_pid) override;
-  void MediaStartedPlaying(const MediaPlayerId& id) override;
-  void MediaStoppedPlaying(const MediaPlayerId& id) override;
+  void MediaStartedPlaying() override;
+  void MediaPaused() override;
  void DidChangeThemeColor(SkColor theme_color) override;

-  // brightray::InspectableWebContentsDelegate:
-  void DevToolsReloadPage() override;
-
  // brightray::InspectableWebContentsViewDelegate:
  void DevToolsFocused() override;
  void DevToolsOpened() override;
  void DevToolsClosed() override;

 private:
+  enum Type {
+    BROWSER_WINDOW,  // Used by BrowserWindow.
+    WEB_VIEW,  // Used by <webview>.
+    REMOTE,  // Thin wrap around an existing WebContents.
+  };
+
  AtomBrowserContext* GetBrowserContext() const;

-  uint32_t GetNextRequestId() {
+  uint32 GetNextRequestId() {
    return ++request_id_;
  }

@@ -339,7 +290,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
  v8::Global<v8::Value> devtools_web_contents_;
  v8::Global<v8::Value> debugger_;

-  std::unique_ptr<WebViewGuestDelegate> guest_delegate_;
+  scoped_ptr<WebViewGuestDelegate> guest_delegate_;

  // The host webcontents that may contain this webcontents.
  WebContents* embedder_;
@@ -348,13 +299,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
  Type type_;

  // Request id used for findInPage request.
-  uint32_t request_id_;
-
-  // Whether background throttling is disabled.
-  bool background_throttling_;
-
-  // Whether to enable devtools.
-  bool enable_devtools_;
+  uint32 request_id_;

  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
@@ -1,30 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/api/atom_api_web_contents.h"
-
-#import <Cocoa/Cocoa.h>
-
-namespace atom {
-
-namespace api {
-
-bool WebContents::IsFocused() const {
-  auto view = web_contents()->GetRenderWidgetHostView();
-  if (!view) return false;
-
-  if (GetType() != BACKGROUND_PAGE) {
-    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])
-      return false;
-  }
-
-  return view->HasFocus();
-}
-
-}  // namespace api
-
-}  // namespace atom
--- a/atom/browser/api/atom_api_web_request.cc
+++ b/atom/browser/api/atom_api_web_request.cc
@@ -36,10 +36,8 @@ namespace atom {

 namespace api {

-WebRequest::WebRequest(v8::Isolate* isolate,
-                       AtomBrowserContext* browser_context)
+WebRequest::WebRequest(AtomBrowserContext* browser_context)
    : browser_context_(browser_context) {
-  Init(isolate);
 }

 WebRequest::~WebRequest() {
@@ -83,14 +81,13 @@ void WebRequest::SetListener(Method method, Event type, mate::Arguments* args) {
 mate::Handle<WebRequest> WebRequest::Create(
    v8::Isolate* isolate,
    AtomBrowserContext* browser_context) {
-  return mate::CreateHandle(isolate, new WebRequest(isolate, browser_context));
+  return mate::CreateHandle(isolate, new WebRequest(browser_context));
 }

 // static
 void WebRequest::BuildPrototype(v8::Isolate* isolate,
-                                v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "WebRequest"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+                                v8::Local<v8::ObjectTemplate> prototype) {
+  mate::ObjectTemplateBuilder(isolate, prototype)
      .SetMethod("onBeforeRequest",
                 &WebRequest::SetResponseListener<
                    AtomNetworkDelegate::kOnBeforeRequest>)
--- a/atom/browser/api/atom_api_web_request.h
+++ b/atom/browser/api/atom_api_web_request.h
@@ -21,12 +21,13 @@ class WebRequest : public mate::TrackableObject<WebRequest> {
  static mate::Handle<WebRequest> Create(v8::Isolate* isolate,
                                         AtomBrowserContext* browser_context);

+  // mate::TrackableObject:
  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
+                             v8::Local<v8::ObjectTemplate> prototype);

 protected:
-  WebRequest(v8::Isolate* isolate, AtomBrowserContext* browser_context);
-  ~WebRequest() override;
+  explicit WebRequest(AtomBrowserContext* browser_context);
+  ~WebRequest();

  // C++ can not distinguish overloaded member function.
  template<AtomNetworkDelegate::SimpleEvent type>
--- a/atom/browser/api/atom_api_web_view_manager.cc
+++ b/atom/browser/api/atom_api_web_view_manager.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.

+#include "atom/browser/api/atom_api_web_contents.h"
 #include "atom/browser/web_contents_preferences.h"
 #include "atom/browser/web_view_manager.h"
-#include "atom/common/native_mate_converters/content_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/node_includes.h"
 #include "content/public/browser/browser_context.h"
@@ -12,14 +12,40 @@

 using atom::WebContentsPreferences;

+namespace mate {
+
+template<>
+struct Converter<content::WebContents*> {
+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
+                     content::WebContents** out) {
+    atom::api::WebContents* contents;
+    if (!Converter<atom::api::WebContents*>::FromV8(isolate, val, &contents))
+      return false;
+    *out = contents->web_contents();
+    return true;
+  }
+};
+
+}  // namespace mate
+
 namespace {

+atom::WebViewManager* GetWebViewManager(content::WebContents* web_contents) {
+  auto context = web_contents->GetBrowserContext();
+  if (context) {
+    auto manager = context->GetGuestManager();
+    return static_cast<atom::WebViewManager*>(manager);
+  } else {
+    return nullptr;
+  }
+}
+
 void AddGuest(int guest_instance_id,
              int element_instance_id,
              content::WebContents* embedder,
              content::WebContents* guest_web_contents,
              const base::DictionaryValue& options) {
-  auto manager = atom::WebViewManager::GetWebViewManager(embedder);
+  auto manager = GetWebViewManager(embedder);
  if (manager)
    manager->AddGuest(guest_instance_id, element_instance_id, embedder,
                      guest_web_contents);
@@ -28,7 +54,7 @@ void AddGuest(int guest_instance_id,
 }

 void RemoveGuest(content::WebContents* embedder, int guest_instance_id) {
-  auto manager = atom::WebViewManager::GetWebViewManager(embedder);
+  auto manager = GetWebViewManager(embedder);
  if (manager)
    manager->RemoveGuest(guest_instance_id);
 }
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -10,30 +10,22 @@
 #include "atom/browser/browser.h"
 #include "atom/browser/native_window.h"
 #include "atom/common/native_mate_converters/callback.h"
-#include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "atom/common/native_mate_converters/image_converter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
+#include "atom/common/node_includes.h"
 #include "atom/common/options_switches.h"
-#include "base/command_line.h"
 #include "content/public/browser/render_process_host.h"
-#include "content/public/common/content_switches.h"
 #include "native_mate/constructor.h"
 #include "native_mate/dictionary.h"
 #include "ui/gfx/geometry/rect.h"

-#if defined(TOOLKIT_VIEWS)
-#include "atom/browser/native_window_views.h"
-#endif
-
 #if defined(OS_WIN)
+#include "atom/browser/native_window_views.h"
 #include "atom/browser/ui/win/taskbar_host.h"
-#include "ui/base/win/shell.h"
 #endif

-#include "atom/common/node_includes.h"
-
 #if defined(OS_WIN)
 namespace mate {

@@ -60,6 +52,61 @@ namespace api {

 namespace {

+void OnCapturePageDone(
+    v8::Isolate* isolate,
+    const base::Callback<void(const gfx::Image&)>& callback,
+    const SkBitmap& bitmap) {
+  v8::Locker locker(isolate);
+  v8::HandleScope handle_scope(isolate);
+  callback.Run(gfx::Image::CreateFrom1xBitmap(bitmap));
+}
+
+// Converts min-width to minWidth, returns false if no conversion is needed.
+bool TranslateOldKey(const std::string& key, std::string* new_key) {
+  if (key.find('-') == std::string::npos)
+    return false;
+  new_key->reserve(key.size());
+  bool next_upper_case = false;
+  for (char c : key) {
+    if (c == '-') {
+      next_upper_case = true;
+    } else if (next_upper_case) {
+      new_key->push_back(base::ToUpperASCII(c));
+      next_upper_case = false;
+    } else {
+      new_key->push_back(c);
+    }
+  }
+  return true;
+}
+
+// Converts min-width to minWidth recursively in the dictionary.
+void TranslateOldOptions(v8::Isolate* isolate, v8::Local<v8::Object> options) {
+  auto context = isolate->GetCurrentContext();
+  auto maybe_keys = options->GetOwnPropertyNames(context);
+  if (maybe_keys.IsEmpty())
+    return;
+  std::vector<std::string> keys;
+  if (!mate::ConvertFromV8(isolate, maybe_keys.ToLocalChecked(), &keys))
+    return;
+  mate::Dictionary dict(isolate, options);
+  for (const auto& key : keys) {
+    v8::Local<v8::Value> value;
+    if (!dict.Get(key, &value))  // Shouldn't happen, but guard it anyway.
+      continue;
+    // Go recursively.
+    v8::Local<v8::Object> sub_options;
+    if (mate::ConvertFromV8(isolate, value, &sub_options))
+      TranslateOldOptions(isolate, sub_options);
+    // Translate key.
+    std::string new_key;
+    if (TranslateOldKey(key, &new_key)) {
+      dict.Set(new_key, value);
+      dict.Delete(key);
+    }
+  }
+}
+
 // Converts binary data to Buffer.
 v8::Local<v8::Value> ToBuffer(v8::Isolate* isolate, void* val, int size) {
  auto buffer = node::Buffer::Copy(isolate, static_cast<char*>(val), size);
@@ -72,71 +119,39 @@ v8::Local<v8::Value> ToBuffer(v8::Isolate* isolate, void* val, int size) {
 }  // namespace


-Window::Window(v8::Isolate* isolate, v8::Local<v8::Object> wrapper,
-               const mate::Dictionary& options) {
-  mate::Handle<class WebContents> web_contents;
-  // If no WebContents was passed to the constructor, create it from options.
-  if (!options.Get("webContents", &web_contents)) {
-    // Use options.webPreferences to create WebContents.
-    mate::Dictionary web_preferences = mate::Dictionary::CreateEmpty(isolate);
-    options.Get(options::kWebPreferences, &web_preferences);
+Window::Window(v8::Isolate* isolate, const mate::Dictionary& options) {
+  // Be compatible with old style field names like min-width.
+  TranslateOldOptions(isolate, options.GetHandle());

-    // Copy the backgroundColor to webContents.
-    v8::Local<v8::Value> value;
-    if (options.Get(options::kBackgroundColor, &value))
-      web_preferences.Set(options::kBackgroundColor, value);
+  // Use options.webPreferences to create WebContents.
+  mate::Dictionary web_preferences = mate::Dictionary::CreateEmpty(isolate);
+  options.Get(options::kWebPreferences, &web_preferences);

-    v8::Local<v8::Value> transparent;
-    if (options.Get("transparent", &transparent))
-      web_preferences.Set("transparent", transparent);
+  // Be compatible with old options which are now in web_preferences.
+  v8::Local<v8::Value> value;
+  if (options.Get(options::kNodeIntegration, &value))
+    web_preferences.Set(options::kNodeIntegration, value);
+  if (options.Get(options::kPreloadScript, &value))
+    web_preferences.Set(options::kPreloadScript, value);
+  if (options.Get(options::kZoomFactor, &value))
+    web_preferences.Set(options::kZoomFactor, value);

-    // Creates the WebContents used by BrowserWindow.
-    web_contents = WebContents::Create(isolate, web_preferences);
-  }
-
-  Init(isolate, wrapper, options, web_contents);
-}
-
-void Window::Init(v8::Isolate* isolate,
-                  v8::Local<v8::Object> wrapper,
-                  const mate::Dictionary& options,
-                  mate::Handle<class WebContents> web_contents) {
+  // Creates the WebContents used by BrowserWindow.
+  auto web_contents = WebContents::Create(isolate, web_preferences);
  web_contents_.Reset(isolate, web_contents.ToV8());
  api_web_contents_ = web_contents.get();

  // Keep a copy of the options for later use.
-  mate::Dictionary(isolate, web_contents->GetWrapper()).Set(
+  mate::Dictionary(isolate, web_contents->GetWrapper(isolate)).Set(
      "browserWindowOptions", options);

-  // The parent window.
-  mate::Handle<Window> parent;
-  if (options.Get("parent", &parent))
-    parent_window_.Reset(isolate, parent.ToV8());
-
  // Creates BrowserWindow.
-  window_.reset(NativeWindow::Create(
-      web_contents->managed_web_contents(),
-      options,
-      parent.IsEmpty() ? nullptr : parent->window_.get()));
+  window_.reset(NativeWindow::Create(web_contents->managed_web_contents(),
+                                     options));
  web_contents->SetOwnerWindow(window_.get());
-
-#if defined(TOOLKIT_VIEWS)
-  // Sets the window icon.
-  mate::Handle<NativeImage> icon;
-  if (options.Get(options::kIcon, &icon))
-    SetIcon(icon);
-#endif
-
  window_->InitFromOptions(options);
  window_->AddObserver(this);
-
-  InitWith(isolate, wrapper);
  AttachAsUserData(window_.get());
-
-  // We can only append this window to parent window's child windows after this
-  // window's JS wrapper gets initialized.
-  if (!parent.IsEmpty())
-    parent->child_windows_.Set(isolate, ID(), wrapper);
 }

 Window::~Window() {
@@ -152,17 +167,6 @@ void Window::WillCloseWindow(bool* prevent_default) {
  *prevent_default = Emit("close");
 }

-void Window::WillDestroyNativeObject() {
-  // Close all child windows before closing current window.
-  v8::Locker locker(isolate());
-  v8::HandleScope handle_scope(isolate());
-  for (v8::Local<v8::Value> value : child_windows_.Values(isolate())) {
-    mate::Handle<Window> child;
-    if (mate::ConvertFromV8(isolate(), value, &child))
-      child->window_->CloseImmediately();
-  }
-}
-
 void Window::OnWindowClosed() {
  api_web_contents_->DestroyWebContents();

@@ -175,8 +179,6 @@ void Window::OnWindowClosed() {

  Emit("closed");

-  RemoveFromParentChildWindows();
-
  // Destroy the native class when window is closed.
  base::MessageLoop::current()->PostTask(FROM_HERE, GetDestroyClosure());
 }
@@ -197,10 +199,6 @@ void Window::OnWindowHide() {
  Emit("hide");
 }

-void Window::OnReadyToShow() {
-  Emit("ready-to-show");
-}
-
 void Window::OnWindowMaximize() {
  Emit("maximize");
 }
@@ -245,14 +243,6 @@ void Window::OnWindowScrollTouchEnd() {
  Emit("scroll-touch-end");
 }

-void Window::OnWindowScrollTouchEdge() {
-  Emit("scroll-touch-edge");
-}
-
-void Window::OnWindowSwipe(const std::string& direction) {
-  Emit("swipe", direction);
-}
-
 void Window::OnWindowEnterHtmlFullScreen() {
  Emit("enter-html-full-screen");
 }
@@ -284,9 +274,10 @@ void Window::OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {
 #endif

 // static
-mate::WrappableBase* Window::New(mate::Arguments* args) {
+mate::Wrappable* Window::New(v8::Isolate* isolate, mate::Arguments* args) {
  if (!Browser::Get()->is_ready()) {
-    args->ThrowError("Cannot create BrowserWindow before app is ready");
+    isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
+        isolate, "Cannot create BrowserWindow before app is ready")));
    return nullptr;
  }

@@ -297,10 +288,10 @@ mate::WrappableBase* Window::New(mate::Arguments* args) {

  mate::Dictionary options;
  if (!(args->Length() == 1 && args->GetNext(&options))) {
-    options = mate::Dictionary::CreateEmpty(args->isolate());
+    options = mate::Dictionary::CreateEmpty(isolate);
  }

-  return new Window(args->isolate(), args->GetThis(), options);
+  return new Window(isolate, options);
 }

 void Window::Close() {
@@ -324,10 +315,6 @@ void Window::Show() {
 }

 void Window::ShowInactive() {
-  // This method doesn't make sense for modal window..
-  if (IsModal())
-    return;
-
  window_->ShowInactive();
 }

@@ -339,10 +326,6 @@ bool Window::IsVisible() {
  return window_->IsVisible();
 }

-bool Window::IsEnabled() {
-  return window_->IsEnabled();
-}
-
 void Window::Maximize() {
  window_->Maximize();
 }
@@ -385,16 +368,6 @@ gfx::Rect Window::GetBounds() {
  return window_->GetBounds();
 }

-void Window::SetContentBounds(const gfx::Rect& bounds, mate::Arguments* args) {
-  bool animate = false;
-  args->GetNext(&animate);
-  window_->SetContentBounds(bounds, animate);
-}
-
-gfx::Rect Window::GetContentBounds() {
-  return window_->GetContentBounds();
-}
-
 void Window::SetSize(int width, int height, mate::Arguments* args) {
  bool animate = false;
  args->GetNext(&animate);
@@ -447,12 +420,6 @@ std::vector<int> Window::GetMaximumSize() {
  return result;
 }

-void Window::SetSheetOffset(double offsetY, mate::Arguments* args) {
-  double offsetX = 0.0;
-  args->GetNext(&offsetX);
-  window_->SetSheetOffset(offsetX, offsetY);
-}
-
 void Window::SetResizable(bool resizable) {
  window_->SetResizable(resizable);
 }
@@ -501,10 +468,8 @@ bool Window::IsClosable() {
  return window_->IsClosable();
 }

-void Window::SetAlwaysOnTop(bool top, mate::Arguments* args) {
-  std::string level = "floating";
-  args->GetNext(&level);
-  window_->SetAlwaysOnTop(top, level);
+void Window::SetAlwaysOnTop(bool top) {
+  window_->SetAlwaysOnTop(top);
 }

 bool Window::IsAlwaysOnTop() {
@@ -597,32 +562,23 @@ void Window::SetIgnoreMouseEvents(bool ignore) {
  return window_->SetIgnoreMouseEvents(ignore);
 }

-void Window::SetContentProtection(bool enable) {
-  return window_->SetContentProtection(enable);
-}
+void Window::CapturePage(mate::Arguments* args) {
+  gfx::Rect rect;
+  base::Callback<void(const gfx::Image&)> callback;

-void Window::SetFocusable(bool focusable) {
-  return window_->SetFocusable(focusable);
-}
-
-void Window::SetProgressBar(double progress, mate::Arguments* args) {
-  mate::Dictionary options;
-  std::string mode;
-  NativeWindow::ProgressState state = NativeWindow::PROGRESS_NORMAL;
-
-  args->GetNext(&options) && options.Get("mode", &mode);
-
-  if (mode == "error") {
-    state = NativeWindow::PROGRESS_ERROR;
-  } else if (mode == "paused") {
-    state = NativeWindow::PROGRESS_PAUSED;
-  } else if (mode == "indeterminate") {
-    state = NativeWindow::PROGRESS_INDETERMINATE;
-  } else if (mode == "none") {
-    state = NativeWindow::PROGRESS_NONE;
+  if (!(args->Length() == 1 && args->GetNext(&callback)) &&
+      !(args->Length() == 2 && args->GetNext(&rect)
+                            && args->GetNext(&callback))) {
+    args->ThrowError();
+    return;
  }

-  window_->SetProgressBar(progress, state);
+  window_->CapturePage(
+      rect, base::Bind(&OnCapturePageDone, args->isolate(), callback));
+}
+
+void Window::SetProgressBar(double progress) {
+  window_->SetProgressBar(progress);
 }

 void Window::SetOverlayIcon(const gfx::Image& overlay,
@@ -639,7 +595,7 @@ bool Window::SetThumbarButtons(mate::Arguments* args) {
  }
  auto window = static_cast<NativeWindowViews*>(window_.get());
  return window->taskbar_host().SetThumbarButtons(
-      window_->GetAcceleratedWidget(), buttons);
+      window->GetAcceleratedWidget(), buttons);
 #else
  return false;
 #endif
@@ -698,49 +654,11 @@ bool Window::IsWindowMessageHooked(UINT message) {
 void Window::UnhookAllWindowMessages() {
  messages_callback_map_.clear();
 }
-
-bool Window::SetThumbnailClip(const gfx::Rect& region) {
-  auto window = static_cast<NativeWindowViews*>(window_.get());
-  return window->taskbar_host().SetThumbnailClip(
-      window_->GetAcceleratedWidget(), region);
-}
-
-bool Window::SetThumbnailToolTip(const std::string& tooltip) {
-  auto window = static_cast<NativeWindowViews*>(window_.get());
-  return window->taskbar_host().SetThumbnailToolTip(
-      window_->GetAcceleratedWidget(), tooltip);
-}
-
-void Window::SetAppDetails(const mate::Dictionary& options) {
-  base::string16 app_id;
-  base::FilePath app_icon_path;
-  int app_icon_index = 0;
-  base::string16 relaunch_command;
-  base::string16 relaunch_display_name;
-
-  options.Get("appId", &app_id);
-  options.Get("appIconPath", &app_icon_path);
-  options.Get("appIconIndex", &app_icon_index);
-  options.Get("relaunchCommand", &relaunch_command);
-  options.Get("relaunchDisplayName", &relaunch_display_name);
-
-  ui::win::SetAppDetailsForWindow(
-      app_id, app_icon_path, app_icon_index,
-      relaunch_command, relaunch_display_name,
-      window_->GetAcceleratedWidget());
-}
 #endif

-#if defined(TOOLKIT_VIEWS)
-void Window::SetIcon(mate::Handle<NativeImage> icon) {
-#if defined(OS_WIN)
-  static_cast<NativeWindowViews*>(window_.get())->SetIcon(
-      icon->GetHICON(GetSystemMetrics(SM_CXSMICON)),
-      icon->GetHICON(GetSystemMetrics(SM_CXICON)));
-#elif defined(USE_X11)
-  static_cast<NativeWindowViews*>(window_.get())->SetIcon(
-      icon->image().AsImageSkia());
-#endif
+#if defined(OS_MACOSX)
+void Window::ShowDefinitionForSelection() {
+  window_->ShowDefinitionForSelection();
 }
 #endif

@@ -750,53 +668,6 @@ void Window::SetAspectRatio(double aspect_ratio, mate::Arguments* args) {
  window_->SetAspectRatio(aspect_ratio, extra_size);
 }

-void Window::PreviewFile(const std::string& path, mate::Arguments* args) {
-  std::string display_name;
-  if (!args->GetNext(&display_name))
-    display_name = path;
-  window_->PreviewFile(path, display_name);
-}
-
-void Window::CloseFilePreview() {
-  window_->CloseFilePreview();
-}
-
-void Window::SetParentWindow(v8::Local<v8::Value> value,
-                             mate::Arguments* args) {
-  if (IsModal()) {
-    args->ThrowError("Can not be called for modal window");
-    return;
-  }
-
-  mate::Handle<Window> parent;
-  if (value->IsNull()) {
-    RemoveFromParentChildWindows();
-    parent_window_.Reset();
-    window_->SetParentWindow(nullptr);
-  } else if (mate::ConvertFromV8(isolate(), value, &parent)) {
-    parent_window_.Reset(isolate(), value);
-    window_->SetParentWindow(parent->window_.get());
-    parent->child_windows_.Set(isolate(), ID(), GetWrapper());
-  } else {
-    args->ThrowError("Must pass BrowserWindow instance or null");
-  }
-}
-
-v8::Local<v8::Value> Window::GetParentWindow() const {
-  if (parent_window_.IsEmpty())
-    return v8::Null(isolate());
-  else
-    return v8::Local<v8::Value>::New(isolate(), parent_window_);
-}
-
-std::vector<v8::Local<v8::Object>> Window::GetChildWindows() const {
-  return child_windows_.Values(isolate());
-}
-
-bool Window::IsModal() const {
-  return window_->is_modal();
-}
-
 v8::Local<v8::Value> Window::GetNativeWindowHandle() {
  gfx::AcceleratedWidget handle = window_->GetAcceleratedWidget();
  return ToBuffer(
@@ -811,17 +682,6 @@ bool Window::IsVisibleOnAllWorkspaces() {
  return window_->IsVisibleOnAllWorkspaces();
 }

-void Window::SetAutoHideCursor(bool auto_hide) {
-  window_->SetAutoHideCursor(auto_hide);
-}
-
-void Window::SetVibrancy(mate::Arguments* args) {
-  std::string type;
-
-  args->GetNext(&type);
-  window_->SetVibrancy(type);
-}
-
 int32_t Window::ID() const {
  return weak_map_id();
 }
@@ -833,22 +693,10 @@ v8::Local<v8::Value> Window::WebContents(v8::Isolate* isolate) {
    return v8::Local<v8::Value>::New(isolate, web_contents_);
 }

-void Window::RemoveFromParentChildWindows() {
-  if (parent_window_.IsEmpty())
-    return;
-
-  mate::Handle<Window> parent;
-  if (!mate::ConvertFromV8(isolate(), GetParentWindow(), &parent))
-    return;
-
-  parent->child_windows_.Remove(ID());
-}
-
 // static
 void Window::BuildPrototype(v8::Isolate* isolate,
-                            v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "BrowserWindow"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
+                            v8::Local<v8::ObjectTemplate> prototype) {
+  mate::ObjectTemplateBuilder(isolate, prototype)
      .MakeDestroyable()
      .SetMethod("close", &Window::Close)
      .SetMethod("focus", &Window::Focus)
@@ -858,7 +706,6 @@ void Window::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("showInactive", &Window::ShowInactive)
      .SetMethod("hide", &Window::Hide)
      .SetMethod("isVisible", &Window::IsVisible)
-      .SetMethod("isEnabled", &Window::IsEnabled)
      .SetMethod("maximize", &Window::Maximize)
      .SetMethod("unmaximize", &Window::Unmaximize)
      .SetMethod("isMaximized", &Window::IsMaximized)
@@ -868,28 +715,17 @@ void Window::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("setFullScreen", &Window::SetFullScreen)
      .SetMethod("isFullScreen", &Window::IsFullscreen)
      .SetMethod("setAspectRatio", &Window::SetAspectRatio)
-      .SetMethod("previewFile", &Window::PreviewFile)
-      .SetMethod("closeFilePreview", &Window::CloseFilePreview)
-#if !defined(OS_WIN)
-      .SetMethod("setParentWindow", &Window::SetParentWindow)
-#endif
-      .SetMethod("getParentWindow", &Window::GetParentWindow)
-      .SetMethod("getChildWindows", &Window::GetChildWindows)
-      .SetMethod("isModal", &Window::IsModal)
      .SetMethod("getNativeWindowHandle", &Window::GetNativeWindowHandle)
      .SetMethod("getBounds", &Window::GetBounds)
      .SetMethod("setBounds", &Window::SetBounds)
      .SetMethod("getSize", &Window::GetSize)
      .SetMethod("setSize", &Window::SetSize)
-      .SetMethod("getContentBounds", &Window::GetContentBounds)
-      .SetMethod("setContentBounds", &Window::SetContentBounds)
      .SetMethod("getContentSize", &Window::GetContentSize)
      .SetMethod("setContentSize", &Window::SetContentSize)
      .SetMethod("setMinimumSize", &Window::SetMinimumSize)
      .SetMethod("getMinimumSize", &Window::GetMinimumSize)
      .SetMethod("setMaximumSize", &Window::SetMaximumSize)
      .SetMethod("getMaximumSize", &Window::GetMaximumSize)
-      .SetMethod("setSheetOffset", &Window::SetSheetOffset)
      .SetMethod("setResizable", &Window::SetResizable)
      .SetMethod("isResizable", &Window::IsResizable)
      .SetMethod("setMovable", &Window::SetMovable)
@@ -921,11 +757,10 @@ void Window::BuildPrototype(v8::Isolate* isolate,
      .SetMethod("setDocumentEdited", &Window::SetDocumentEdited)
      .SetMethod("isDocumentEdited", &Window::IsDocumentEdited)
      .SetMethod("setIgnoreMouseEvents", &Window::SetIgnoreMouseEvents)
-      .SetMethod("setContentProtection", &Window::SetContentProtection)
-      .SetMethod("setFocusable", &Window::SetFocusable)
      .SetMethod("focusOnWebView", &Window::FocusOnWebView)
      .SetMethod("blurWebView", &Window::BlurWebView)
      .SetMethod("isWebViewFocused", &Window::IsWebViewFocused)
+      .SetMethod("capturePage", &Window::CapturePage)
      .SetMethod("setProgressBar", &Window::SetProgressBar)
      .SetMethod("setOverlayIcon", &Window::SetOverlayIcon)
      .SetMethod("setThumbarButtons", &Window::SetThumbarButtons)
@@ -938,21 +773,15 @@ void Window::BuildPrototype(v8::Isolate* isolate,
                 &Window::SetVisibleOnAllWorkspaces)
      .SetMethod("isVisibleOnAllWorkspaces",
                 &Window::IsVisibleOnAllWorkspaces)
-#if defined(OS_MACOSX)
-      .SetMethod("setAutoHideCursor", &Window::SetAutoHideCursor)
-#endif
-      .SetMethod("setVibrancy", &Window::SetVibrancy)
 #if defined(OS_WIN)
      .SetMethod("hookWindowMessage", &Window::HookWindowMessage)
      .SetMethod("isWindowMessageHooked", &Window::IsWindowMessageHooked)
      .SetMethod("unhookWindowMessage", &Window::UnhookWindowMessage)
      .SetMethod("unhookAllWindowMessages", &Window::UnhookAllWindowMessages)
-      .SetMethod("setThumbnailClip", &Window::SetThumbnailClip)
-      .SetMethod("setThumbnailToolTip", &Window::SetThumbnailToolTip)
-      .SetMethod("setAppDetails", &Window::SetAppDetails)
 #endif
-#if defined(TOOLKIT_VIEWS)
-      .SetMethod("setIcon", &Window::SetIcon)
+#if defined(OS_MACOSX)
+      .SetMethod("showDefinitionForSelection",
+                 &Window::ShowDefinitionForSelection)
 #endif
      .SetProperty("id", &Window::ID)
      .SetProperty("webContents", &Window::WebContents);
@@ -963,7 +792,7 @@ v8::Local<v8::Value> Window::From(v8::Isolate* isolate,
                                  NativeWindow* native_window) {
  auto existing = TrackableObject::FromWrappedClass(isolate, native_window);
  if (existing)
-    return existing->GetWrapper();
+    return existing->GetWrapper(isolate);
  else
    return v8::Null(isolate);
 }
@@ -980,10 +809,9 @@ using atom::api::Window;
 void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
                v8::Local<v8::Context> context, void* priv) {
  v8::Isolate* isolate = context->GetIsolate();
-  Window::SetConstructor(isolate, base::Bind(&Window::New));
-
-  mate::Dictionary browser_window(
-      isolate, Window::GetConstructor(isolate)->GetFunction());
+  v8::Local<v8::Function> constructor = mate::CreateConstructor<Window>(
+      isolate, "BrowserWindow", base::Bind(&Window::New));
+  mate::Dictionary browser_window(isolate, constructor);
  browser_window.SetMethod("fromId",
                           &mate::TrackableObject<Window>::FromWeakMapID);
  browser_window.SetMethod("getAllWindows",
--- a/atom/browser/api/atom_api_window.h
+++ b/atom/browser/api/atom_api_window.h
@@ -6,17 +6,15 @@
 #define ATOM_BROWSER_API_ATOM_API_WINDOW_H_

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

+#include "base/memory/scoped_ptr.h"
+#include "ui/gfx/image/image.h"
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/native_window.h"
 #include "atom/browser/native_window_observer.h"
-#include "atom/common/api/atom_api_native_image.h"
-#include "atom/common/key_weak_map.h"
 #include "native_mate/handle.h"
-#include "ui/gfx/image/image.h"

 class GURL;

@@ -40,10 +38,10 @@ class WebContents;
 class Window : public mate::TrackableObject<Window>,
               public NativeWindowObserver {
 public:
-  static mate::WrappableBase* New(mate::Arguments* args);
+  static mate::Wrappable* New(v8::Isolate* isolate, mate::Arguments* args);

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

  // Returns the BrowserWindow object from |native_window|.
  static v8::Local<v8::Value> From(v8::Isolate* isolate,
@@ -52,19 +50,16 @@ class Window : public mate::TrackableObject<Window>,
  NativeWindow* window() const { return window_.get(); }

 protected:
-  Window(v8::Isolate* isolate, v8::Local<v8::Object> wrapper,
-         const mate::Dictionary& options);
-  ~Window() override;
+  Window(v8::Isolate* isolate, const mate::Dictionary& options);
+  virtual ~Window();

  // NativeWindowObserver:
  void WillCloseWindow(bool* prevent_default) override;
-  void WillDestroyNativeObject() override;
  void OnWindowClosed() override;
  void OnWindowBlur() override;
  void OnWindowFocus() override;
  void OnWindowShow() override;
  void OnWindowHide() override;
-  void OnReadyToShow() override;
  void OnWindowMaximize() override;
  void OnWindowUnmaximize() override;
  void OnWindowMinimize() override;
@@ -74,8 +69,6 @@ class Window : public mate::TrackableObject<Window>,
  void OnWindowMoved() override;
  void OnWindowScrollTouchBegin() override;
  void OnWindowScrollTouchEnd() override;
-  void OnWindowScrollTouchEdge() override;
-  void OnWindowSwipe(const std::string& direction) override;
  void OnWindowEnterFullScreen() override;
  void OnWindowLeaveFullScreen() override;
  void OnWindowEnterHtmlFullScreen() override;
@@ -89,10 +82,6 @@ class Window : public mate::TrackableObject<Window>,
  #endif

 private:
-  void Init(v8::Isolate* isolate,
-            v8::Local<v8::Object> wrapper,
-            const mate::Dictionary& options,
-            mate::Handle<class WebContents> web_contents);
  // APIs for NativeWindow.
  void Close();
  void Focus();
@@ -102,7 +91,6 @@ class Window : public mate::TrackableObject<Window>,
  void ShowInactive();
  void Hide();
  bool IsVisible();
-  bool IsEnabled();
  void Maximize();
  void Unmaximize();
  bool IsMaximized();
@@ -117,13 +105,10 @@ class Window : public mate::TrackableObject<Window>,
  std::vector<int> GetSize();
  void SetContentSize(int width, int height, mate::Arguments* args);
  std::vector<int> GetContentSize();
-  void SetContentBounds(const gfx::Rect& bounds, mate::Arguments* args);
-  gfx::Rect GetContentBounds();
  void SetMinimumSize(int width, int height);
  std::vector<int> GetMinimumSize();
  void SetMaximumSize(int width, int height);
  std::vector<int> GetMaximumSize();
-  void SetSheetOffset(double offsetY, mate::Arguments* args);
  void SetResizable(bool resizable);
  bool IsResizable();
  void SetMovable(bool movable);
@@ -136,7 +121,7 @@ class Window : public mate::TrackableObject<Window>,
  bool IsFullScreenable();
  void SetClosable(bool closable);
  bool IsClosable();
-  void SetAlwaysOnTop(bool top, mate::Arguments* args);
+  void SetAlwaysOnTop(bool top);
  bool IsAlwaysOnTop();
  void Center();
  void SetPosition(int x, int y, mate::Arguments* args);
@@ -158,9 +143,8 @@ class Window : public mate::TrackableObject<Window>,
  void SetDocumentEdited(bool edited);
  bool IsDocumentEdited();
  void SetIgnoreMouseEvents(bool ignore);
-  void SetContentProtection(bool enable);
-  void SetFocusable(bool focusable);
-  void SetProgressBar(double progress, mate::Arguments* args);
+  void CapturePage(mate::Arguments* args);
+  void SetProgressBar(double progress);
  void SetOverlayIcon(const gfx::Image& overlay,
                      const std::string& description);
  bool SetThumbarButtons(mate::Arguments* args);
@@ -170,12 +154,6 @@ class Window : public mate::TrackableObject<Window>,
  void SetMenuBarVisibility(bool visible);
  bool IsMenuBarVisible();
  void SetAspectRatio(double aspect_ratio, mate::Arguments* args);
-  void PreviewFile(const std::string& path, mate::Arguments* args);
-  void CloseFilePreview();
-  void SetParentWindow(v8::Local<v8::Value> value, mate::Arguments* args);
-  v8::Local<v8::Value> GetParentWindow() const;
-  std::vector<v8::Local<v8::Object>> GetChildWindows() const;
-  bool IsModal() const;
  v8::Local<v8::Value> GetNativeWindowHandle();

 #if defined(OS_WIN)
@@ -186,28 +164,18 @@ class Window : public mate::TrackableObject<Window>,
  bool IsWindowMessageHooked(UINT message);
  void UnhookWindowMessage(UINT message);
  void UnhookAllWindowMessages();
-  bool SetThumbnailClip(const gfx::Rect& region);
-  bool SetThumbnailToolTip(const std::string& tooltip);
-  void SetAppDetails(const mate::Dictionary& options);
 #endif

-#if defined(TOOLKIT_VIEWS)
-  void SetIcon(mate::Handle<NativeImage> icon);
+#if defined(OS_MACOSX)
+  void ShowDefinitionForSelection();
 #endif

  void SetVisibleOnAllWorkspaces(bool visible);
  bool IsVisibleOnAllWorkspaces();

-  void SetAutoHideCursor(bool auto_hide);
-
-  void SetVibrancy(mate::Arguments* args);
-
  int32_t ID() const;
  v8::Local<v8::Value> WebContents(v8::Isolate* isolate);

-  // Remove this window from parent window's |child_windows_|.
-  void RemoveFromParentChildWindows();
-
 #if defined(OS_WIN)
  typedef std::map<UINT, MessageCallback> MessageCallbackMap;
  MessageCallbackMap messages_callback_map_;
@@ -215,12 +183,10 @@ class Window : public mate::TrackableObject<Window>,

  v8::Global<v8::Value> web_contents_;
  v8::Global<v8::Value> menu_;
-  v8::Global<v8::Value> parent_window_;
-  KeyWeakMap<int> child_windows_;

  api::WebContents* api_web_contents_;

-  std::unique_ptr<NativeWindow> window_;
+  scoped_ptr<NativeWindow> window_;

  DISALLOW_COPY_AND_ASSIGN(Window);
 };
--- a/atom/browser/api/event.cc
+++ b/atom/browser/api/event.cc
@@ -11,15 +11,31 @@

 namespace mate {

-Event::Event(v8::Isolate* isolate)
-    : sender_(nullptr),
-      message_(nullptr) {
-  Init(isolate);
+namespace {
+
+v8::Persistent<v8::ObjectTemplate> template_;
+
+}  // namespace
+
+Event::Event()
+    : sender_(NULL),
+      message_(NULL) {
 }

 Event::~Event() {
 }

+ObjectTemplateBuilder Event::GetObjectTemplateBuilder(v8::Isolate* isolate) {
+  if (template_.IsEmpty())
+    template_.Reset(isolate, ObjectTemplateBuilder(isolate)
+        .SetMethod("preventDefault", &Event::PreventDefault)
+        .SetMethod("sendReply", &Event::SendReply)
+        .Build());
+
+  return ObjectTemplateBuilder(
+      isolate, v8::Local<v8::ObjectTemplate>::New(isolate, template_));
+}
+
 void Event::SetSenderAndMessage(content::WebContents* sender,
                                IPC::Message* message) {
  DCHECK(!sender_);
@@ -31,38 +47,26 @@ void Event::SetSenderAndMessage(content::WebContents* sender,
 }

 void Event::WebContentsDestroyed() {
-  sender_ = nullptr;
-  message_ = nullptr;
+  sender_ = NULL;
+  message_ = NULL;
 }

 void Event::PreventDefault(v8::Isolate* isolate) {
-  GetWrapper()->Set(StringToV8(isolate, "defaultPrevented"),
+  GetWrapper(isolate)->Set(StringToV8(isolate, "defaultPrevented"),
                           v8::True(isolate));
 }

 bool Event::SendReply(const base::string16& json) {
-  if (message_ == nullptr || sender_ == nullptr)
+  if (message_ == NULL || sender_ == NULL)
    return false;

  AtomViewHostMsg_Message_Sync::WriteReplyParams(message_, json);
-  bool success = sender_->Send(message_);
-  message_ = nullptr;
-  sender_ = nullptr;
-  return success;
+  return sender_->Send(message_);
 }

 // static
 Handle<Event> Event::Create(v8::Isolate* isolate) {
-  return mate::CreateHandle(isolate, new Event(isolate));
-}
-
-// static
-void Event::BuildPrototype(
-    v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
-  prototype->SetClassName(mate::StringToV8(isolate, "Event"));
-  mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
-      .SetMethod("preventDefault", &Event::PreventDefault)
-      .SetMethod("sendReply", &Event::SendReply);
+  return CreateHandle(isolate, new Event);
 }

 }  // namespace mate
--- a/atom/browser/api/event.h
+++ b/atom/browser/api/event.h
@@ -6,8 +6,8 @@
 #define ATOM_BROWSER_API_EVENT_H_

 #include "content/public/browser/web_contents_observer.h"
-#include "native_mate/handle.h"
 #include "native_mate/wrappable.h"
+#include "native_mate/handle.h"

 namespace IPC {
 class Message;
@@ -15,14 +15,11 @@ class Message;

 namespace mate {

-class Event : public Wrappable<Event>,
+class Event : public Wrappable,
              public content::WebContentsObserver {
 public:
  static Handle<Event> Create(v8::Isolate* isolate);

-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::FunctionTemplate> prototype);
-
  // Pass the sender and message to be replied.
  void SetSenderAndMessage(content::WebContents* sender, IPC::Message* message);

@@ -33,8 +30,11 @@ class Event : public Wrappable<Event>,
  bool SendReply(const base::string16& json);

 protected:
-  explicit Event(v8::Isolate* isolate);
-  ~Event() override;
+  Event();
+  virtual ~Event();
+
+  // Wrappable implementations:
+  ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate* isolate) override;

  // content::WebContentsObserver implementations:
  void WebContentsDestroyed() override;
--- a/atom/browser/api/event_emitter.cc
+++ b/atom/browser/api/event_emitter.cc
@@ -8,9 +8,6 @@
 #include "native_mate/arguments.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
-#include "ui/events/event_constants.h"
-
-#include "atom/common/node_includes.h"

 namespace mate {

@@ -37,13 +34,11 @@ v8::Local<v8::Object> CreateEventObject(v8::Isolate* isolate) {

 }  // namespace

-namespace internal {
+EventEmitter::EventEmitter() {
+}

-v8::Local<v8::Object> CreateJSEvent(
-    v8::Isolate* isolate,
-    v8::Local<v8::Object> object,
-    content::WebContents* sender,
-    IPC::Message* message) {
+v8::Local<v8::Object> EventEmitter::CreateJSEvent(
+    v8::Isolate* isolate, content::WebContents* sender, IPC::Message* message) {
  v8::Local<v8::Object> event;
  bool use_native_event = sender && message;

@@ -54,29 +49,16 @@ v8::Local<v8::Object> CreateJSEvent(
  } else {
    event = CreateEventObject(isolate);
  }
-  mate::Dictionary(isolate, event).Set("sender", object);
+  mate::Dictionary(isolate, event).Set("sender", GetWrapper(isolate));
  return event;
 }

-v8::Local<v8::Object> CreateCustomEvent(
-    v8::Isolate* isolate,
-    v8::Local<v8::Object> object,
-    v8::Local<v8::Object> custom_event) {
+v8::Local<v8::Object> EventEmitter::CreateCustomEvent(
+    v8::Isolate* isolate, v8::Local<v8::Object> custom_event) {
  v8::Local<v8::Object> event = CreateEventObject(isolate);
  (void)event->SetPrototype(custom_event->CreationContext(), custom_event);
-  mate::Dictionary(isolate, event).Set("sender", object);
+  mate::Dictionary(isolate, event).Set("sender", GetWrapper(isolate));
  return event;
 }

-v8::Local<v8::Object> CreateEventFromFlags(v8::Isolate* isolate, int flags) {
-  mate::Dictionary obj = mate::Dictionary::CreateEmpty(isolate);
-  obj.Set("shiftKey", static_cast<bool>(flags & ui::EF_SHIFT_DOWN));
-  obj.Set("ctrlKey", static_cast<bool>(flags & ui::EF_CONTROL_DOWN));
-  obj.Set("altKey", static_cast<bool>(flags & ui::EF_ALT_DOWN));
-  obj.Set("metaKey", static_cast<bool>(flags & ui::EF_COMMAND_DOWN));
-  return obj.GetHandle();
-}
-
-}  // namespace internal
-
 }  // namespace mate
--- a/atom/browser/api/event_emitter.h
+++ b/atom/browser/api/event_emitter.h
@@ -20,49 +20,17 @@ class Message;

 namespace mate {

-namespace internal {
-
-v8::Local<v8::Object> CreateJSEvent(v8::Isolate* isolate,
-                                    v8::Local<v8::Object> object,
-                                    content::WebContents* sender,
-                                    IPC::Message* message);
-v8::Local<v8::Object> CreateCustomEvent(
-    v8::Isolate* isolate,
-    v8::Local<v8::Object> object,
-    v8::Local<v8::Object> event);
-v8::Local<v8::Object> CreateEventFromFlags(v8::Isolate* isolate, int flags);
-
-}  // namespace internal
-
 // Provide helperers to emit event in JavaScript.
-template<typename T>
-class EventEmitter : public Wrappable<T> {
+class EventEmitter : public Wrappable {
 public:
  typedef std::vector<v8::Local<v8::Value>> ValueArray;

-  // Make the convinient methods visible:
-  // https://isocpp.org/wiki/faq/templates#nondependent-name-lookup-members
-  v8::Local<v8::Object> GetWrapper() { return Wrappable<T>::GetWrapper(); }
-  v8::Isolate* isolate() const { return Wrappable<T>::isolate(); }
-
  // this.emit(name, event, args...);
  template<typename... Args>
  bool EmitCustomEvent(const base::StringPiece& name,
                       v8::Local<v8::Object> event,
                       const Args&... args) {
-    return EmitWithEvent(
-        name,
-        internal::CreateCustomEvent(isolate(), GetWrapper(), event), args...);
-  }
-
-  // this.emit(name, new Event(flags), args...);
-  template<typename... Args>
-  bool EmitWithFlags(const base::StringPiece& name,
-                     int flags,
-                     const Args&... args) {
-    return EmitCustomEvent(
-        name,
-        internal::CreateEventFromFlags(isolate(), flags), args...);
+    return EmitWithEvent(name, CreateCustomEvent(isolate(), event), args...);
  }

  // this.emit(name, new Event(), args...);
@@ -79,13 +47,12 @@ class EventEmitter : public Wrappable<T> {
                      const Args&... args) {
    v8::Locker locker(isolate());
    v8::HandleScope handle_scope(isolate());
-    v8::Local<v8::Object> event = internal::CreateJSEvent(
-        isolate(), GetWrapper(), sender, message);
+    v8::Local<v8::Object> event = CreateJSEvent(isolate(), sender, message);
    return EmitWithEvent(name, event, args...);
  }

 protected:
-  EventEmitter() {}
+  EventEmitter();

 private:
  // this.emit(name, event, args...);
@@ -95,11 +62,17 @@ class EventEmitter : public Wrappable<T> {
                     const Args&... args) {
    v8::Locker locker(isolate());
    v8::HandleScope handle_scope(isolate());
-    EmitEvent(isolate(), GetWrapper(), name, event, args...);
+    EmitEvent(isolate(), GetWrapper(isolate()), name, event, args...);
    return event->Get(
        StringToV8(isolate(), "defaultPrevented"))->BooleanValue();
  }

+  v8::Local<v8::Object> CreateJSEvent(v8::Isolate* isolate,
+                                      content::WebContents* sender,
+                                      IPC::Message* message);
+  v8::Local<v8::Object> CreateCustomEvent(
+      v8::Isolate* isolate, v8::Local<v8::Object> event);
+
  DISALLOW_COPY_AND_ASSIGN(EventEmitter);
 };

--- a/atom/browser/api/frame_subscriber.cc
+++ b/atom/browser/api/frame_subscriber.cc
@@ -4,13 +4,9 @@

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

-#include "atom/common/native_mate_converters/gfx_converter.h"
 #include "base/bind.h"
-#include "content/public/browser/render_widget_host.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
-
 #include "atom/common/node_includes.h"
+#include "content/public/browser/render_widget_host.h"

 namespace atom {

@@ -18,17 +14,12 @@ namespace api {

 FrameSubscriber::FrameSubscriber(v8::Isolate* isolate,
                                 content::RenderWidgetHostView* view,
-                                 const FrameCaptureCallback& callback,
-                                 bool only_dirty)
-    : isolate_(isolate),
-      view_(view),
-      callback_(callback),
-      only_dirty_(only_dirty),
-      weak_factory_(this) {
+                                 const FrameCaptureCallback& callback)
+    : isolate_(isolate), view_(view), callback_(callback), weak_factory_(this) {
 }

 bool FrameSubscriber::ShouldCaptureFrame(
-    const gfx::Rect& dirty_rect,
+    const gfx::Rect& damage_rect,
    base::TimeTicks present_time,
    scoped_refptr<media::VideoFrame>* storage,
    DeliverFrameCallback* callback) {
@@ -36,39 +27,21 @@ bool FrameSubscriber::ShouldCaptureFrame(
  if (!view_ || !host)
    return false;

-  if (dirty_rect.IsEmpty())
-    return false;
-
-  gfx::Rect rect = gfx::Rect(view_->GetVisibleViewportSize());
-  if (only_dirty_)
-    rect = dirty_rect;
-
-  gfx::Size view_size = rect.size();
-  gfx::Size bitmap_size = view_size;
-  const gfx::NativeView native_view = view_->GetNativeView();
-  const float scale =
-      display::Screen::GetScreen()->GetDisplayNearestWindow(native_view)
-      .device_scale_factor();
-  if (scale > 1.0f)
-    bitmap_size = gfx::ScaleToCeiledSize(view_size, scale);
-
-  rect = gfx::Rect(rect.origin(), bitmap_size);
+  const auto size = view_->GetVisibleViewportSize();

  host->CopyFromBackingStore(
-      rect,
-      rect.size(),
+      gfx::Rect(size),
+      size,
      base::Bind(&FrameSubscriber::OnFrameDelivered,
-                 weak_factory_.GetWeakPtr(), callback_, rect),
+                 weak_factory_.GetWeakPtr(), callback_),
      kBGRA_8888_SkColorType);

  return false;
 }

 void FrameSubscriber::OnFrameDelivered(const FrameCaptureCallback& callback,
-                                       const gfx::Rect& damage_rect,
-                                       const SkBitmap& bitmap,
-                                       content::ReadbackResponse response) {
-  if (response != content::ReadbackResponse::READBACK_SUCCESS)
+  const SkBitmap& bitmap, content::ReadbackResponse response) {
+  if (bitmap.computeSize64() == 0)
    return;

  v8::Locker locker(isolate_);
@@ -81,13 +54,10 @@ void FrameSubscriber::OnFrameDelivered(const FrameCaptureCallback& callback,
    return;

  bitmap.copyPixelsTo(
-    reinterpret_cast<uint8_t*>(node::Buffer::Data(buffer.ToLocalChecked())),
+    reinterpret_cast<uint8*>(node::Buffer::Data(buffer.ToLocalChecked())),
    rgb_arr_size);

-  v8::Local<v8::Value> damage =
-      mate::Converter<gfx::Rect>::ToV8(isolate_, damage_rect);
-
-  callback_.Run(buffer.ToLocalChecked(), damage);
+  callback_.Run(buffer.ToLocalChecked());
 }

 }  // namespace api
--- a/atom/browser/api/frame_subscriber.h
+++ b/atom/browser/api/frame_subscriber.h
@@ -7,9 +7,9 @@

 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
-#include "content/public/browser/readback_types.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/render_widget_host_view_frame_subscriber.h"
+#include "content/public/browser/readback_types.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/size.h"
 #include "v8/include/v8.h"
@@ -20,13 +20,11 @@ namespace api {

 class FrameSubscriber : public content::RenderWidgetHostViewFrameSubscriber {
 public:
-  using FrameCaptureCallback =
-      base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>)>;
+  using FrameCaptureCallback = base::Callback<void(v8::Local<v8::Value>)>;

  FrameSubscriber(v8::Isolate* isolate,
                  content::RenderWidgetHostView* view,
-                  const FrameCaptureCallback& callback,
-                  bool only_dirty);
+                  const FrameCaptureCallback& callback);

  bool ShouldCaptureFrame(const gfx::Rect& damage_rect,
                          base::TimeTicks present_time,
@@ -35,14 +33,11 @@ class FrameSubscriber : public content::RenderWidgetHostViewFrameSubscriber {

 private:
  void OnFrameDelivered(const FrameCaptureCallback& callback,
-                        const gfx::Rect& damage_rect,
-                        const SkBitmap& bitmap,
-                        content::ReadbackResponse response);
+    const SkBitmap& bitmap, content::ReadbackResponse response);

  v8::Isolate* isolate_;
  content::RenderWidgetHostView* view_;
  FrameCaptureCallback callback_;
-  bool only_dirty_;

  base::WeakPtrFactory<FrameSubscriber> weak_factory_;

--- a/atom/browser/api/save_page_handler.cc
+++ b/atom/browser/api/save_page_handler.cc
@@ -73,6 +73,11 @@ void SavePageHandler::Destroy(content::DownloadItem* item) {
  delete this;
 }

+// static
+bool SavePageHandler::IsSavePageTypes(const std::string& type) {
+  return type == "multipart/related" || type == "text/html";
+}
+
 }  // namespace api

 }  // namespace atom
--- a/atom/browser/api/save_page_handler.h
+++ b/atom/browser/api/save_page_handler.h
@@ -37,6 +37,8 @@ class SavePageHandler : public content::DownloadManager::Observer,
  bool Handle(const base::FilePath& full_path,
              const content::SavePageType& save_type);

+  static bool IsSavePageTypes(const std::string& type);
+
 private:
  void Destroy(content::DownloadItem* item);

--- a/atom/browser/api/trackable_object.cc
+++ b/atom/browser/api/trackable_object.cc
@@ -29,7 +29,7 @@ class IDUserData : public base::SupportsUserData::Data {
 }  // namespace

 TrackableObjectBase::TrackableObjectBase()
-    : weak_map_id_(0), weak_factory_(this) {
+    : weak_map_id_(0), wrapped_(nullptr), weak_factory_(this) {
  cleanup_ = RegisterDestructionCallback(GetDestroyClosure());
 }

@@ -37,6 +37,15 @@ TrackableObjectBase::~TrackableObjectBase() {
  cleanup_.Run();
 }

+void TrackableObjectBase::AfterInit(v8::Isolate* isolate) {
+  if (wrapped_)
+    AttachAsUserData(wrapped_);
+}
+
+void TrackableObjectBase::MarkDestroyed() {
+  GetWrapper(isolate())->SetAlignedPointerInInternalField(0, nullptr);
+}
+
 base::Closure TrackableObjectBase::GetDestroyClosure() {
  return base::Bind(&TrackableObjectBase::Destroy, weak_factory_.GetWeakPtr());
 }
@@ -46,7 +55,14 @@ void TrackableObjectBase::Destroy() {
 }

 void TrackableObjectBase::AttachAsUserData(base::SupportsUserData* wrapped) {
-  wrapped->SetUserData(kTrackedObjectKey, new IDUserData(weak_map_id_));
+  if (weak_map_id_ != 0) {
+    wrapped->SetUserData(kTrackedObjectKey, new IDUserData(weak_map_id_));
+    wrapped_ = nullptr;
+  } else {
+    // If the TrackableObjectBase is not ready yet then delay SetUserData until
+    // AfterInit is called.
+    wrapped_ = wrapped;
+  }
 }

 // static
--- a/atom/browser/api/trackable_object.h
+++ b/atom/browser/api/trackable_object.h
@@ -8,8 +8,9 @@
 #include <vector>

 #include "atom/browser/api/event_emitter.h"
-#include "atom/common/key_weak_map.h"
+#include "atom/common/id_weak_map.h"
 #include "base/bind.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "native_mate/object_template_builder.h"

@@ -20,7 +21,7 @@ class SupportsUserData;
 namespace mate {

 // Users should use TrackableObject instead.
-class TrackableObjectBase {
+class TrackableObjectBase : public mate::EventEmitter {
 public:
  TrackableObjectBase();

@@ -31,7 +32,13 @@ class TrackableObjectBase {
  void AttachAsUserData(base::SupportsUserData* wrapped);

 protected:
-  virtual ~TrackableObjectBase();
+  ~TrackableObjectBase() override;
+
+  // mate::Wrappable:
+  void AfterInit(v8::Isolate* isolate) override;
+
+  // Mark the JS object as destroyed.
+  void MarkDestroyed();

  // Returns a closure that can destroy the native class.
  base::Closure GetDestroyClosure();
@@ -44,6 +51,7 @@ class TrackableObjectBase {
  static base::Closure RegisterDestructionCallback(const base::Closure& c);

  int32_t weak_map_id_;
+  base::SupportsUserData* wrapped_;

 private:
  void Destroy();
@@ -57,14 +65,8 @@ class TrackableObjectBase {
 // All instances of TrackableObject will be kept in a weak map and can be got
 // from its ID.
 template<typename T>
-class TrackableObject : public TrackableObjectBase,
-                        public mate::EventEmitter<T> {
+class TrackableObject : public TrackableObjectBase {
 public:
-  // Mark the JS object as destroyed.
-  void MarkDestroyed() {
-    Wrappable<T>::GetWrapper()->SetAlignedPointerInInternalField(0, nullptr);
-  }
-
  // Finds out the TrackableObject from its ID in weak map.
  static T* FromWeakMapID(v8::Isolate* isolate, int32_t id) {
    if (!weak_map_)
@@ -104,32 +106,50 @@ class TrackableObject : public TrackableObjectBase,

 protected:
  TrackableObject() {}
-
  ~TrackableObject() override {
    RemoveFromWeakMap();
  }

-  void InitWith(v8::Isolate* isolate, v8::Local<v8::Object> wrapper) override {
-    WrappableBase::InitWith(isolate, wrapper);
+  void AfterInit(v8::Isolate* isolate) override {
    if (!weak_map_) {
-      weak_map_ = new atom::KeyWeakMap<int32_t>;
+      weak_map_.reset(new atom::IDWeakMap);
+      RegisterDestructionCallback(
+          base::Bind(&TrackableObject<T>::ReleaseAllWeakReferences));
    }
-    weak_map_id_ = ++next_id_;
-    weak_map_->Set(isolate, weak_map_id_, wrapper);
+    weak_map_id_ = weak_map_->Add(isolate, GetWrapper(isolate));
+    TrackableObjectBase::AfterInit(isolate);
  }

 private:
-  static int32_t next_id_;
-  static atom::KeyWeakMap<int32_t>* weak_map_;  // leaked on purpose
+  // mate::Wrappable:
+  mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate) override {
+    if (template_.IsEmpty()) {
+      auto templ = v8::ObjectTemplate::New(isolate);
+      T::BuildPrototype(isolate, templ);
+      template_.Reset(isolate, templ);
+    }
+
+    return ObjectTemplateBuilder(
+        isolate, v8::Local<v8::ObjectTemplate>::New(isolate, template_));
+  }
+
+  // Releases all weak references in weak map, called when app is terminating.
+  static void ReleaseAllWeakReferences() {
+    weak_map_.reset();
+  }
+
+  static v8::Persistent<v8::ObjectTemplate> template_;
+  static scoped_ptr<atom::IDWeakMap> weak_map_;

  DISALLOW_COPY_AND_ASSIGN(TrackableObject);
 };

 template<typename T>
-int32_t TrackableObject<T>::next_id_ = 0;
+v8::Persistent<v8::ObjectTemplate> TrackableObject<T>::template_;

 template<typename T>
-atom::KeyWeakMap<int32_t>* TrackableObject<T>::weak_map_ = nullptr;
+scoped_ptr<atom::IDWeakMap> TrackableObject<T>::weak_map_;

 }  // namespace mate

--- a/atom/browser/atom_access_token_store.cc
+++ b/atom/browser/atom_access_token_store.cc
@@ -4,66 +4,27 @@

 #include "atom/browser/atom_access_token_store.h"

-#include <string>
 #include <utility>

 #include "atom/browser/atom_browser_context.h"
+#include "atom/browser/atom_browser_main_parts.h"
 #include "atom/common/google_api_key.h"
-#include "base/environment.h"
-#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/geolocation_provider.h"

-using content::BrowserThread;
-
 namespace atom {

-namespace internal {
+namespace {

-// Loads access tokens and other necessary data on the UI thread, and
-// calls back to the originator on the originating thread.
-class TokenLoadingJob : public base::RefCountedThreadSafe<TokenLoadingJob> {
- public:
-  explicit TokenLoadingJob(
-      const content::AccessTokenStore::LoadAccessTokensCallback& callback)
-      : callback_(callback), request_context_getter_(nullptr) {}
+// Notice that we just combined the api key with the url together here, because
+// if we use the standard {url: key} format Chromium would override our key with
+// the predefined one in common.gypi of libchromiumcontent, which is empty.
+const char* kGeolocationProviderURL =
+    "https://www.googleapis.com/geolocation/v1/geolocate?key="
+    GOOGLEAPIS_API_KEY;

-  void Run(AtomBrowserContext* browser_context) {
-    DCHECK_CURRENTLY_ON(BrowserThread::UI);
-    request_context_getter_ = browser_context->GetRequestContext();
-    std::unique_ptr<base::Environment> env(base::Environment::Create());
-    if (!env->GetVar("GOOGLE_API_KEY", &api_key_))
-      api_key_ = GOOGLEAPIS_API_KEY;
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(&TokenLoadingJob::RespondOnIOThread, this));
-  }
-
- private:
-  friend class base::RefCountedThreadSafe<TokenLoadingJob>;
-
-  ~TokenLoadingJob() {}
-
-  void RespondOnIOThread() {
-    // Equivalent to access_token_map[kGeolocationProviderURL].
-    // Somehow base::string16 is causing compilation errors when used in a pair
-    // of std::map on Linux, this can work around it.
-    content::AccessTokenStore::AccessTokenMap access_token_map;
-    std::pair<GURL, base::string16> token_pair;
-    token_pair.first = GURL(GOOGLEAPIS_ENDPOINT + api_key_);
-    access_token_map.insert(token_pair);
-
-    callback_.Run(access_token_map, request_context_getter_);
-  }
-
-  content::AccessTokenStore::LoadAccessTokensCallback callback_;
-  net::URLRequestContextGetter* request_context_getter_;
-  std::string api_key_;
-};
-
-}  // namespace internal
+}  // namespace

 AtomAccessTokenStore::AtomAccessTokenStore() {
-  browser_context_ = AtomBrowserContext::From("", false);
  content::GeolocationProvider::GetInstance()->UserDidOptIntoLocationServices();
 }

@@ -71,17 +32,18 @@ AtomAccessTokenStore::~AtomAccessTokenStore() {
 }

 void AtomAccessTokenStore::LoadAccessTokens(
-    const LoadAccessTokensCallback& callback) {
-  scoped_refptr<internal::TokenLoadingJob> job(
-      new internal::TokenLoadingJob(callback));
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-                          base::Bind(&AtomAccessTokenStore::RunTokenLoadingJob,
-                                     this, base::RetainedRef(job)));
-}
+    const LoadAccessTokensCallbackType& callback) {
+  AccessTokenSet access_token_set;

-void AtomAccessTokenStore::RunTokenLoadingJob(
-    scoped_refptr<internal::TokenLoadingJob> job) {
-  job->Run(browser_context_.get());
+  // Equivelent to access_token_set[kGeolocationProviderURL].
+  // Somehow base::string16 is causing compilation errors when used in a pair
+  // of std::map on Linux, this can work around it.
+  std::pair<GURL, base::string16> token_pair;
+  token_pair.first = GURL(kGeolocationProviderURL);
+  access_token_set.insert(token_pair);
+
+  auto browser_context = AtomBrowserMainParts::Get()->browser_context();
+  callback.Run(access_token_set, browser_context->url_request_context_getter());
 }

 void AtomAccessTokenStore::SaveAccessToken(const GURL& server_url,
--- a/atom/browser/atom_access_token_store.h
+++ b/atom/browser/atom_access_token_store.h
@@ -11,25 +11,18 @@ namespace atom {

 class AtomBrowserContext;

-namespace internal {
-class TokenLoadingJob;
-}
-
 class AtomAccessTokenStore : public content::AccessTokenStore {
 public:
  AtomAccessTokenStore();
-  ~AtomAccessTokenStore();
+  virtual ~AtomAccessTokenStore();

  // content::AccessTokenStore:
  void LoadAccessTokens(
-      const LoadAccessTokensCallback& callback) override;
+      const LoadAccessTokensCallbackType& callback) override;
  void SaveAccessToken(const GURL& server_url,
                       const base::string16& access_token) override;

 private:
-  void RunTokenLoadingJob(scoped_refptr<internal::TokenLoadingJob> job);
-
-  scoped_refptr<AtomBrowserContext> browser_context_;
  DISALLOW_COPY_AND_ASSIGN(AtomAccessTokenStore);
 };

--- a/atom/browser/atom_blob_reader.cc
+++ b/atom/browser/atom_blob_reader.cc
@@ -1,138 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/atom_blob_reader.h"
-
-#include "content/browser/blob_storage/chrome_blob_storage_context.h"
-#include "content/public/browser/browser_thread.h"
-#include "net/base/io_buffer.h"
-#include "net/base/net_errors.h"
-#include "storage/browser/blob/blob_data_handle.h"
-#include "storage/browser/blob/blob_reader.h"
-#include "storage/browser/blob/blob_storage_context.h"
-#include "storage/browser/fileapi/file_system_context.h"
-
-#include "atom/common/node_includes.h"
-
-using content::BrowserThread;
-
-namespace atom {
-
-namespace {
-
-void FreeNodeBufferData(char* data, void* hint) {
-  delete[] data;
-}
-
-void RunCallbackInUI(
-    const AtomBlobReader::CompletionCallback& callback,
-    char* blob_data,
-    int size) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  v8::Isolate* isolate = v8::Isolate::GetCurrent();
-  v8::Locker locker(isolate);
-  v8::HandleScope handle_scope(isolate);
-  if (blob_data) {
-    v8::Local<v8::Value> buffer = node::Buffer::New(isolate,
-        blob_data, static_cast<size_t>(size), &FreeNodeBufferData, nullptr)
-        .ToLocalChecked();
-    callback.Run(buffer);
-  } else {
-    callback.Run(v8::Null(isolate));
-  }
-}
-
-}  // namespace
-
-AtomBlobReader::AtomBlobReader(
-    content::ChromeBlobStorageContext* blob_context,
-    storage::FileSystemContext* file_system_context)
-    : blob_context_(blob_context),
-      file_system_context_(file_system_context) {
-}
-
-AtomBlobReader::~AtomBlobReader() {
-}
-
-void AtomBlobReader::StartReading(
-    const std::string& uuid,
-    const AtomBlobReader::CompletionCallback& completion_callback) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  auto blob_data_handle =
-      blob_context_->context()->GetBlobDataFromUUID(uuid);
-  auto callback = base::Bind(&RunCallbackInUI,
-                             completion_callback);
-  if (!blob_data_handle) {
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(callback, nullptr, 0));
-    return;
-  }
-
-  auto blob_reader = blob_data_handle->CreateReader(
-      file_system_context_.get(),
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE).get());
-  BlobReadHelper* blob_read_helper =
-      new BlobReadHelper(std::move(blob_reader), callback);
-  blob_read_helper->Read();
-}
-
-AtomBlobReader::BlobReadHelper::BlobReadHelper(
-    std::unique_ptr<storage::BlobReader> blob_reader,
-    const BlobReadHelper::CompletionCallback& callback)
-    : blob_reader_(std::move(blob_reader)),
-      completion_callback_(callback) {
-}
-
-AtomBlobReader::BlobReadHelper::~BlobReadHelper() {
-}
-
-void AtomBlobReader::BlobReadHelper::Read() {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  storage::BlobReader::Status size_status = blob_reader_->CalculateSize(
-      base::Bind(&AtomBlobReader::BlobReadHelper::DidCalculateSize,
-                 base::Unretained(this)));
-  if (size_status != storage::BlobReader::Status::IO_PENDING)
-    DidCalculateSize(net::OK);
-}
-
-void AtomBlobReader::BlobReadHelper::DidCalculateSize(int result) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  if (result != net::OK) {
-    DidReadBlobData(nullptr, 0);
-    return;
-  }
-
-  uint64_t total_size = blob_reader_->total_size();
-  int bytes_read = 0;
-  scoped_refptr<net::IOBuffer> blob_data =
-      new net::IOBuffer(static_cast<size_t>(total_size));
-  auto callback = base::Bind(&AtomBlobReader::BlobReadHelper::DidReadBlobData,
-                             base::Unretained(this),
-                             base::RetainedRef(blob_data));
-  storage::BlobReader::Status read_status = blob_reader_->Read(
-      blob_data.get(),
-      total_size,
-      &bytes_read,
-      callback);
-  if (read_status != storage::BlobReader::Status::IO_PENDING)
-    callback.Run(bytes_read);
-}
-
-void AtomBlobReader::BlobReadHelper::DidReadBlobData(
-    const scoped_refptr<net::IOBuffer>& blob_data,
-    int size) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  char* data = new char[size];
-  memcpy(data, blob_data->data(), size);
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-      base::Bind(completion_callback_, data, size));
-  delete this;
-}
-
-}  // namespace atom
--- a/atom/browser/atom_blob_reader.h
+++ b/atom/browser/atom_blob_reader.h
@@ -1,80 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_ATOM_BLOB_READER_H_
-#define ATOM_BROWSER_ATOM_BLOB_READER_H_
-
-#include <string>
-
-#include "base/callback.h"
-
-namespace content {
-class ChromeBlobStorageContext;
-}
-
-namespace net {
-class IOBuffer;
-}
-
-namespace storage {
-class BlobDataHandle;
-class BlobReader;
-class FileSystemContext;
-}
-
-namespace v8 {
-template <class T>
-class Local;
-class Value;
-}
-
-namespace atom {
-
-// A class to keep track of the blob context. All methods,
-// except Ctor are expected to be called on IO thread.
-class AtomBlobReader {
- public:
-  using CompletionCallback = base::Callback<void(v8::Local<v8::Value>)>;
-
-  AtomBlobReader(content::ChromeBlobStorageContext* blob_context,
-                 storage::FileSystemContext* file_system_context);
-  ~AtomBlobReader();
-
-  void StartReading(
-      const std::string& uuid,
-      const AtomBlobReader::CompletionCallback& callback);
-
- private:
-  // A self-destroyed helper class to read the blob data.
-  // Must be accessed on IO thread.
-  class BlobReadHelper {
-   public:
-    using CompletionCallback = base::Callback<void(char*, int)>;
-
-    BlobReadHelper(std::unique_ptr<storage::BlobReader> blob_reader,
-                   const BlobReadHelper::CompletionCallback& callback);
-    ~BlobReadHelper();
-
-    void Read();
-
-   private:
-    void DidCalculateSize(int result);
-    void DidReadBlobData(const scoped_refptr<net::IOBuffer>& blob_data,
-                         int bytes_read);
-
-    std::unique_ptr<storage::BlobReader> blob_reader_;
-    BlobReadHelper::CompletionCallback completion_callback_;
-
-    DISALLOW_COPY_AND_ASSIGN(BlobReadHelper);
-  };
-
-  scoped_refptr<content::ChromeBlobStorageContext> blob_context_;
-  scoped_refptr<storage::FileSystemContext> file_system_context_;
-
-  DISALLOW_COPY_AND_ASSIGN(AtomBlobReader);
-};
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_ATOM_BLOB_READER_H_
--- a/atom/browser/atom_browser_client.cc
+++ b/atom/browser/atom_browser_client.cc
@@ -8,8 +8,6 @@
 #include <shlobj.h>
 #endif

-#include "atom/browser/api/atom_api_app.h"
-#include "atom/browser/api/atom_api_protocol.h"
 #include "atom/browser/atom_access_token_store.h"
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/atom_browser_main_parts.h"
@@ -24,23 +22,21 @@
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/stl_util.h"
-#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "chrome/browser/printing/printing_message_filter.h"
 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
 #include "chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h"
 #include "chrome/browser/speech/tts_message_filter.h"
-#include "content/common/resource_request_body_impl.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/client_certificate_delegate.h"
-#include "content/public/browser/geolocation_delegate.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/url_constants.h"
 #include "content/public/common/web_preferences.h"
+#include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -50,26 +46,37 @@ namespace atom {

 namespace {

+// The default routing id of WebContents.
+// In Electron each RenderProcessHost only has one WebContents, so this ID is
+// same for every WebContents.
+int kDefaultRoutingID = 2;
+
 // Next navigation should not restart renderer process.
 bool g_suppress_renderer_process_restart = false;

+// Custom schemes to be registered to standard.
+std::string g_custom_schemes = "";
 // Custom schemes to be registered to handle service worker.
 std::string g_custom_service_worker_schemes = "";

-// A provider of Geolocation services to override AccessTokenStore.
-class AtomGeolocationDelegate : public content::GeolocationDelegate {
- public:
-  AtomGeolocationDelegate() = default;
+scoped_refptr<net::X509Certificate> ImportCertFromFile(
+    const base::FilePath& path) {
+  if (path.empty())
+    return nullptr;

-  content::AccessTokenStore* CreateAccessTokenStore() final {
-    return new AtomAccessTokenStore();
-  }
+  std::string cert_data;
+  if (!base::ReadFileToString(path, &cert_data))
+    return nullptr;

- private:
-  DISALLOW_COPY_AND_ASSIGN(AtomGeolocationDelegate);
-};
+  net::CertificateList certs =
+      net::X509Certificate::CreateCertificateListFromBytes(
+          cert_data.data(), cert_data.size(),
+          net::X509Certificate::FORMAT_AUTO);

-void Noop(scoped_refptr<content::SiteInstance>) {
+  if (certs.empty())
+    return nullptr;
+
+  return certs[0];
 }

 }  // namespace
@@ -79,6 +86,11 @@ void AtomBrowserClient::SuppressRendererProcessRestartForOnce() {
  g_suppress_renderer_process_restart = true;
 }

+void AtomBrowserClient::SetCustomSchemes(
+    const std::vector<std::string>& schemes) {
+  g_custom_schemes = base::JoinString(schemes, ",");
+}
+
 void AtomBrowserClient::SetCustomServiceWorkerSchemes(
    const std::vector<std::string>& schemes) {
  g_custom_service_worker_schemes = base::JoinString(schemes, ",");
@@ -90,55 +102,6 @@ AtomBrowserClient::AtomBrowserClient() : delegate_(nullptr) {
 AtomBrowserClient::~AtomBrowserClient() {
 }

-content::WebContents* AtomBrowserClient::GetWebContentsFromProcessID(
-    int process_id) {
-  // If the process is a pending process, we should use the old one.
-  if (ContainsKey(pending_processes_, process_id))
-    process_id = pending_processes_[process_id];
-
-  // Certain render process will be created with no associated render view,
-  // for example: ServiceWorker.
-  return WebContentsPreferences::GetWebContentsFromProcessID(process_id);
-}
-
-bool AtomBrowserClient::ShouldCreateNewSiteInstance(
-    content::BrowserContext* browser_context,
-    content::SiteInstance* current_instance,
-    const GURL& url) {
-
-  if (url.SchemeIs(url::kJavaScriptScheme))
-    // "javacript:" scheme should always use same SiteInstance
-    return false;
-
-  if (!IsRendererSandboxed(current_instance->GetProcess()->GetID()))
-    // non-sandboxed renderers should always create a new SiteInstance
-    return true;
-
-  // Create new a SiteInstance if navigating to a different site.
-  auto src_url = current_instance->GetSiteURL();
-  return
-      !content::SiteInstance::IsSameWebSite(browser_context, src_url, url) &&
-      // `IsSameWebSite` doesn't seem to work for some URIs such as `file:`,
-      // handle these scenarios by comparing only the site as defined by
-      // `GetSiteForURL`.
-      content::SiteInstance::GetSiteForURL(browser_context, url) != src_url;
-}
-
-void AtomBrowserClient::AddSandboxedRendererId(int process_id) {
-  base::AutoLock auto_lock(sandboxed_renderers_lock_);
-  sandboxed_renderers_.insert(process_id);
-}
-
-void AtomBrowserClient::RemoveSandboxedRendererId(int process_id) {
-  base::AutoLock auto_lock(sandboxed_renderers_lock_);
-  sandboxed_renderers_.erase(process_id);
-}
-
-bool AtomBrowserClient::IsRendererSandboxed(int process_id) {
-  base::AutoLock auto_lock(sandboxed_renderers_lock_);
-  return sandboxed_renderers_.count(process_id);
-}
-
 void AtomBrowserClient::RenderProcessWillLaunch(
    content::RenderProcessHost* host) {
  int process_id = host->GetID();
@@ -146,13 +109,6 @@ void AtomBrowserClient::RenderProcessWillLaunch(
  host->AddFilter(new TtsMessageFilter(process_id, host->GetBrowserContext()));
  host->AddFilter(
      new WidevineCdmMessageFilter(process_id, host->GetBrowserContext()));
-
-  content::WebContents* web_contents = GetWebContentsFromProcessID(process_id);
-  if (WebContentsPreferences::IsSandboxed(web_contents)) {
-    AddSandboxedRendererId(host->GetID());
-    // ensure the sandboxed renderer id is removed later
-    host->AddObserver(this);
-  }
 }

 content::SpeechRecognitionManagerDelegate*
@@ -160,9 +116,8 @@ content::SpeechRecognitionManagerDelegate*
  return new AtomSpeechRecognitionManagerDelegate;
 }

-content::GeolocationDelegate*
-AtomBrowserClient::CreateGeolocationDelegate() {
-  return new AtomGeolocationDelegate();
+content::AccessTokenStore* AtomBrowserClient::CreateAccessTokenStore() {
+  return new AtomAccessTokenStore;
 }

 void AtomBrowserClient::OverrideWebkitPrefs(
@@ -202,19 +157,11 @@ void AtomBrowserClient::OverrideSiteInstanceForNavigation(
    return;
  }

-  if (!ShouldCreateNewSiteInstance(browser_context, current_instance, url))
+  // Restart renderer process for all navigations except "javacript:" scheme.
+  if (url.SchemeIs(url::kJavaScriptScheme))
    return;

-  scoped_refptr<content::SiteInstance> site_instance =
-      content::SiteInstance::CreateForURL(browser_context, url);
-  *new_instance = site_instance.get();
-
-  // Make sure the |site_instance| is not freed when this function returns.
-  // FIXME(zcbenz): We should adjust OverrideSiteInstanceForNavigation's
-  // interface to solve this.
-  content::BrowserThread::PostTask(
-      content::BrowserThread::UI, FROM_HERE,
-      base::Bind(&Noop, base::RetainedRef(site_instance)));
+  *new_instance = content::SiteInstance::CreateForURL(browser_context, url);

  // Remember the original renderer process of the pending renderer process.
  auto current_process = current_instance->GetProcess();
@@ -231,14 +178,10 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
  if (process_type != "renderer")
    return;

-  // Copy following switches to child process.
-  static const char* const kCommonSwitchNames[] = {
-    switches::kStandardSchemes,
-    switches::kEnableSandbox
-  };
-  command_line->CopySwitchesFrom(
-      *base::CommandLine::ForCurrentProcess(),
-      kCommonSwitchNames, arraysize(kCommonSwitchNames));
+  // The registered standard schemes.
+  if (!g_custom_schemes.empty())
+    command_line->AppendSwitchASCII(switches::kRegisterStandardSchemes,
+                                    g_custom_schemes);

  // The registered service worker schemes.
  if (!g_custom_service_worker_schemes.empty())
@@ -254,7 +197,20 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
  }
 #endif

-  content::WebContents* web_contents = GetWebContentsFromProcessID(process_id);
+  // If the process is a pending process, we should use the old one.
+  if (ContainsKey(pending_processes_, process_id))
+    process_id = pending_processes_[process_id];
+
+
+  // Certain render process will be created with no associated render view,
+  // for example: ServiceWorker.
+  auto rvh = content::RenderViewHost::FromID(process_id, kDefaultRoutingID);
+  if (!rvh)
+    return;
+
+  // Get the WebContents of the render process.
+  content::WebContents* web_contents =
+      content::WebContents::FromRenderViewHost(rvh);
  if (!web_contents)
    return;

@@ -265,7 +221,7 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
 void AtomBrowserClient::DidCreatePpapiPlugin(
    content::BrowserPpapiHost* host) {
  host->GetPpapiHost()->AddHostFactoryFilter(
-      base::WrapUnique(new chrome::ChromeBrowserPepperHostFactory(host)));
+      make_scoped_ptr(new chrome::ChromeBrowserPepperHostFactory(host)));
 }

 content::QuotaPermissionContext*
@@ -274,7 +230,8 @@ content::QuotaPermissionContext*
 }

 void AtomBrowserClient::AllowCertificateError(
-    content::WebContents* web_contents,
+    int render_process_id,
+    int render_frame_id,
    int cert_error,
    const net::SSLInfo& ssl_info,
    const GURL& request_url,
@@ -286,7 +243,7 @@ void AtomBrowserClient::AllowCertificateError(
    content::CertificateRequestResultType* request) {
  if (delegate_) {
    delegate_->AllowCertificateError(
-        web_contents, cert_error, ssl_info, request_url,
+        render_process_id, render_frame_id, cert_error, ssl_info, request_url,
        resource_type, overridable, strict_enforcement,
        expired_previous_decision, callback, request);
  }
@@ -295,10 +252,20 @@ void AtomBrowserClient::AllowCertificateError(
 void AtomBrowserClient::SelectClientCertificate(
    content::WebContents* web_contents,
    net::SSLCertRequestInfo* cert_request_info,
-    std::unique_ptr<content::ClientCertificateDelegate> delegate) {
+    scoped_ptr<content::ClientCertificateDelegate> delegate) {
+  // --client-certificate=`path`
+  auto cmd = base::CommandLine::ForCurrentProcess();
+  if (cmd->HasSwitch(switches::kClientCertificate)) {
+    auto cert_path = cmd->GetSwitchValuePath(switches::kClientCertificate);
+    auto certificate = ImportCertFromFile(cert_path);
+    if (certificate.get())
+      delegate->ContinueWithCertificate(certificate.get());
+    return;
+  }
+
  if (!cert_request_info->client_certs.empty() && delegate_) {
    delegate_->SelectClientCertificate(
-        web_contents, cert_request_info, std::move(delegate));
+        web_contents, cert_request_info, delegate.Pass());
  }
 }

@@ -309,58 +276,6 @@ void AtomBrowserClient::ResourceDispatcherHostCreated() {
      resource_dispatcher_host_delegate_.get());
 }

-bool AtomBrowserClient::CanCreateWindow(
-    const GURL& opener_url,
-    const GURL& opener_top_level_frame_url,
-    const GURL& source_origin,
-    WindowContainerType container_type,
-    const std::string& frame_name,
-    const GURL& target_url,
-    const content::Referrer& referrer,
-    WindowOpenDisposition disposition,
-    const blink::WebWindowFeatures& features,
-    const std::vector<base::string16>& additional_features,
-    const scoped_refptr<content::ResourceRequestBodyImpl>& body,
-    bool user_gesture,
-    bool opener_suppressed,
-    content::ResourceContext* context,
-    int render_process_id,
-    int opener_render_view_id,
-    int opener_render_frame_id,
-    bool* no_javascript_access) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-
-  if (IsRendererSandboxed(render_process_id)) {
-    *no_javascript_access = false;
-    return true;
-  }
-
-  if (delegate_) {
-    content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
-        base::Bind(&api::App::OnCreateWindow,
-                   base::Unretained(static_cast<api::App*>(delegate_)),
-                                    target_url,
-                                    frame_name,
-                                    disposition,
-                                    additional_features,
-                                    body,
-                                    render_process_id,
-                                    opener_render_frame_id));
-  }
-
-  return false;
-}
-
-void AtomBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
-    std::vector<std::string>* additional_schemes) {
-  auto schemes_list = api::GetStandardSchemes();
-  if (!schemes_list.empty())
-    additional_schemes->insert(additional_schemes->end(),
-                               schemes_list.begin(),
-                               schemes_list.end());
-  additional_schemes->push_back(content::kChromeDevToolsScheme);
-}
-
 brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
    const content::MainFunctionParams&) {
  v8::V8::Initialize();  // Init V8 before creating main parts.
@@ -369,21 +284,20 @@ brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(

 void AtomBrowserClient::WebNotificationAllowed(
    int render_process_id,
-    const base::Callback<void(bool, bool)>& callback) {
-  content::WebContents* web_contents =
-      WebContentsPreferences::GetWebContentsFromProcessID(render_process_id);
+    const base::Callback<void(bool)>& callback) {
+  content::WebContents* web_contents = content::WebContents::FromRenderViewHost(
+      content::RenderViewHost::FromID(render_process_id, kDefaultRoutingID));
  if (!web_contents) {
-    callback.Run(false, false);
+    callback.Run(false);
    return;
  }
  auto permission_helper =
      WebContentsPermissionHelper::FromWebContents(web_contents);
  if (!permission_helper) {
-    callback.Run(false, false);
+    callback.Run(false);
    return;
  }
-  permission_helper->RequestWebNotificationPermission(
-      base::Bind(callback, web_contents->IsAudioMuted()));
+  permission_helper->RequestWebNotificationPermission(callback);
 }

 void AtomBrowserClient::RenderProcessHostDestroyed(
@@ -395,7 +309,6 @@ void AtomBrowserClient::RenderProcessHostDestroyed(
      break;
    }
  }
-  RemoveSandboxedRendererId(process_id);
 }

 }  // namespace atom
--- a/atom/browser/atom_browser_client.h
+++ b/atom/browser/atom_browser_client.h
@@ -6,7 +6,6 @@
 #define ATOM_BROWSER_ATOM_BROWSER_CLIENT_H_

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

@@ -35,12 +34,10 @@ class AtomBrowserClient : public brightray::BrowserClient,
  using Delegate = content::ContentBrowserClient;
  void set_delegate(Delegate* delegate) { delegate_ = delegate; }

-  // Returns the WebContents for pending render processes.
-  content::WebContents* GetWebContentsFromProcessID(int process_id);
-
  // Don't force renderer process to restart for once.
  static void SuppressRendererProcessRestartForOnce();
-
+  // Custom schemes to be registered to standard.
+  static void SetCustomSchemes(const std::vector<std::string>& schemes);
  // Custom schemes to be registered to handle service worker.
  static void SetCustomServiceWorkerSchemes(
      const std::vector<std::string>& schemes);
@@ -50,7 +47,7 @@ class AtomBrowserClient : public brightray::BrowserClient,
  void RenderProcessWillLaunch(content::RenderProcessHost* host) override;
  content::SpeechRecognitionManagerDelegate*
      CreateSpeechRecognitionManagerDelegate() override;
-  content::GeolocationDelegate* CreateGeolocationDelegate() override;
+  content::AccessTokenStore* CreateAccessTokenStore() override;
  void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
                           content::WebPreferences* prefs) override;
  std::string GetApplicationLocale() override;
@@ -64,7 +61,8 @@ class AtomBrowserClient : public brightray::BrowserClient,
  void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
  content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
  void AllowCertificateError(
-      content::WebContents* web_contents,
+      int render_process_id,
+      int render_frame_id,
      int cert_error,
      const net::SSLInfo& ssl_info,
      const GURL& request_url,
@@ -77,56 +75,24 @@ class AtomBrowserClient : public brightray::BrowserClient,
  void SelectClientCertificate(
      content::WebContents* web_contents,
      net::SSLCertRequestInfo* cert_request_info,
-      std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
+      scoped_ptr<content::ClientCertificateDelegate> delegate) override;
  void ResourceDispatcherHostCreated() override;
-  bool CanCreateWindow(
-      const GURL& opener_url,
-      const GURL& opener_top_level_frame_url,
-      const GURL& source_origin,
-      WindowContainerType container_type,
-      const std::string& frame_name,
-      const GURL& target_url,
-      const content::Referrer& referrer,
-      WindowOpenDisposition disposition,
-      const blink::WebWindowFeatures& features,
-      const std::vector<base::string16>& additional_features,
-      const scoped_refptr<content::ResourceRequestBodyImpl>& body,
-      bool user_gesture,
-      bool opener_suppressed,
-      content::ResourceContext* context,
-      int render_process_id,
-      int opener_render_view_id,
-      int opener_render_frame_id,
-      bool* no_javascript_access) override;
-  void GetAdditionalAllowedSchemesForFileSystem(
-      std::vector<std::string>* schemes) override;

  // brightray::BrowserClient:
  brightray::BrowserMainParts* OverrideCreateBrowserMainParts(
      const content::MainFunctionParams&) override;
  void WebNotificationAllowed(
      int render_process_id,
-      const base::Callback<void(bool, bool)>& callback) override;
+      const base::Callback<void(bool)>& callback) override;

  // content::RenderProcessHostObserver:
  void RenderProcessHostDestroyed(content::RenderProcessHost* host) override;

 private:
-  bool ShouldCreateNewSiteInstance(content::BrowserContext* browser_context,
-                                   content::SiteInstance* current_instance,
-                                   const GURL& dest_url);
-  // Add/remove a process id to `sandboxed_renderers_`.
-  void AddSandboxedRendererId(int process_id);
-  void RemoveSandboxedRendererId(int process_id);
-  bool IsRendererSandboxed(int process_id);
-
  // pending_render_process => current_render_process.
  std::map<int, int> pending_processes_;
-  // Set that contains the process ids of all sandboxed renderers
-  std::set<int> sandboxed_renderers_;
-  base::Lock sandboxed_renderers_lock_;

-  std::unique_ptr<AtomResourceDispatcherHostDelegate>
+  scoped_ptr<AtomResourceDispatcherHostDelegate>
      resource_dispatcher_host_delegate_;

  Delegate* delegate_;
--- a/atom/browser/atom_browser_context.cc
+++ b/atom/browser/atom_browser_context.cc
@@ -4,45 +4,38 @@

 #include "atom/browser/atom_browser_context.h"

-#include "atom/browser/api/atom_api_protocol.h"
-#include "atom/browser/atom_blob_reader.h"
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/atom_download_manager_delegate.h"
-#include "atom/browser/atom_permission_manager.h"
 #include "atom/browser/browser.h"
-#include "atom/browser/net/about_protocol_handler.h"
-#include "atom/browser/net/asar/asar_protocol_handler.h"
 #include "atom/browser/net/atom_cert_verifier.h"
-#include "atom/browser/net/atom_ct_delegate.h"
 #include "atom/browser/net/atom_network_delegate.h"
 #include "atom/browser/net/atom_ssl_config_service.h"
 #include "atom/browser/net/atom_url_request_job_factory.h"
+#include "atom/browser/net/asar/asar_protocol_handler.h"
 #include "atom/browser/net/http_protocol_handler.h"
+#include "atom/browser/atom_permission_manager.h"
 #include "atom/browser/web_view_manager.h"
 #include "atom/common/atom_version.h"
 #include "atom/common/chrome_version.h"
 #include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
-#include "base/memory/ptr_util.h"
 #include "base/path_service.h"
+#include "base/prefs/pref_registry_simple.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/worker_pool.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
-#include "components/prefs/pref_registry_simple.h"
-#include "content/browser/blob_storage/chrome_blob_storage_context.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/storage_partition.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/user_agent.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/url_request/data_protocol_handler.h"
 #include "net/url_request/ftp_protocol_handler.h"
-#include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_intercepting_job_factory.h"
+#include "net/url_request/url_request_context.h"
 #include "url/url_constants.h"

 using content::BrowserThread;
@@ -53,7 +46,7 @@ namespace {

 class NoCacheBackend : public net::HttpCache::BackendFactory {
  int CreateBackend(net::NetLog* net_log,
-                    std::unique_ptr<disk_cache::Backend>* backend,
+                    scoped_ptr<disk_cache::Backend>* backend,
                    const net::CompletionCallback& callback) override {
    return net::ERR_FAILED;
  }
@@ -70,13 +63,22 @@ std::string RemoveWhitespace(const std::string& str) {
 }  // namespace

 AtomBrowserContext::AtomBrowserContext(const std::string& partition,
-                                       bool in_memory,
-                                       const base::DictionaryValue& options)
+                                       bool in_memory)
    : brightray::BrowserContext(partition, in_memory),
-      ct_delegate_(new AtomCTDelegate),
+      cert_verifier_(nullptr),
+      job_factory_(new AtomURLRequestJobFactory),
      network_delegate_(new AtomNetworkDelegate),
-      cookie_delegate_(new AtomCookieDelegate) {
-  // Construct user agent string.
+      allow_ntlm_everywhere_(false) {
+}
+
+AtomBrowserContext::~AtomBrowserContext() {
+}
+
+net::NetworkDelegate* AtomBrowserContext::CreateNetworkDelegate() {
+  return network_delegate_;
+}
+
+std::string AtomBrowserContext::GetUserAgent() {
  Browser* browser = Browser::Get();
  std::string name = RemoveWhitespace(browser->GetName());
  std::string user_agent;
@@ -90,83 +92,63 @@ AtomBrowserContext::AtomBrowserContext(const std::string& partition,
        browser->GetVersion().c_str(),
        CHROME_VERSION_STRING);
  }
-  user_agent_ = content::BuildUserAgentFromProduct(user_agent);
-
-  // Read options.
-  use_cache_ = true;
-  options.GetBoolean("cache", &use_cache_);
-
-  // Initialize Pref Registry in brightray.
-  InitPrefs();
+  return content::BuildUserAgentFromProduct(user_agent);
 }

-AtomBrowserContext::~AtomBrowserContext() {
-}
-
-void AtomBrowserContext::SetUserAgent(const std::string& user_agent) {
-  user_agent_ = user_agent;
-}
-
-net::NetworkDelegate* AtomBrowserContext::CreateNetworkDelegate() {
-  return network_delegate_;
-}
-
-net::CookieMonsterDelegate* AtomBrowserContext::CreateCookieDelegate() {
-  return cookie_delegate();
-}
-
-std::string AtomBrowserContext::GetUserAgent() {
-  return user_agent_;
-}
-
-std::unique_ptr<net::URLRequestJobFactory>
+scoped_ptr<net::URLRequestJobFactory>
 AtomBrowserContext::CreateURLRequestJobFactory(
-    content::ProtocolHandlerMap* protocol_handlers) {
-  std::unique_ptr<AtomURLRequestJobFactory> job_factory(
-      new AtomURLRequestJobFactory);
+    content::ProtocolHandlerMap* handlers,
+    content::URLRequestInterceptorScopedVector* interceptors) {
+  scoped_ptr<AtomURLRequestJobFactory> job_factory(job_factory_);

-  for (auto& it : *protocol_handlers) {
+  for (auto& it : *handlers) {
    job_factory->SetProtocolHandler(it.first,
-                                    base::WrapUnique(it.second.release()));
+                                    make_scoped_ptr(it.second.release()));
  }
-  protocol_handlers->clear();
+  handlers->clear();

-  job_factory->SetProtocolHandler(url::kAboutScheme,
-                                  base::WrapUnique(new AboutProtocolHandler));
  job_factory->SetProtocolHandler(
-      url::kDataScheme, base::WrapUnique(new net::DataProtocolHandler));
+      url::kDataScheme, make_scoped_ptr(new net::DataProtocolHandler));
  job_factory->SetProtocolHandler(
-      url::kFileScheme, base::WrapUnique(new asar::AsarProtocolHandler(
+      url::kFileScheme, make_scoped_ptr(new asar::AsarProtocolHandler(
          BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior(
              base::SequencedWorkerPool::SKIP_ON_SHUTDOWN))));
  job_factory->SetProtocolHandler(
      url::kHttpScheme,
-      base::WrapUnique(new HttpProtocolHandler(url::kHttpScheme)));
+      make_scoped_ptr(new HttpProtocolHandler(url::kHttpScheme)));
  job_factory->SetProtocolHandler(
      url::kHttpsScheme,
-      base::WrapUnique(new HttpProtocolHandler(url::kHttpsScheme)));
+      make_scoped_ptr(new HttpProtocolHandler(url::kHttpsScheme)));
  job_factory->SetProtocolHandler(
      url::kWsScheme,
-      base::WrapUnique(new HttpProtocolHandler(url::kWsScheme)));
+      make_scoped_ptr(new HttpProtocolHandler(url::kWsScheme)));
  job_factory->SetProtocolHandler(
      url::kWssScheme,
-      base::WrapUnique(new HttpProtocolHandler(url::kWssScheme)));
+      make_scoped_ptr(new HttpProtocolHandler(url::kWssScheme)));

  auto host_resolver =
      url_request_context_getter()->GetURLRequestContext()->host_resolver();
  job_factory->SetProtocolHandler(
      url::kFtpScheme,
-      base::WrapUnique(new net::FtpProtocolHandler(
+      make_scoped_ptr(new net::FtpProtocolHandler(
          new net::FtpNetworkLayer(host_resolver))));

-  return std::move(job_factory);
+  // Set up interceptors in the reverse order.
+  scoped_ptr<net::URLRequestJobFactory> top_job_factory = job_factory.Pass();
+  content::URLRequestInterceptorScopedVector::reverse_iterator it;
+  for (it = interceptors->rbegin(); it != interceptors->rend(); ++it)
+    top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
+        top_job_factory.Pass(), make_scoped_ptr(*it)));
+  interceptors->weak_clear();
+
+  return top_job_factory.Pass();
 }

 net::HttpCache::BackendFactory*
 AtomBrowserContext::CreateHttpCacheBackendFactory(
    const base::FilePath& base_path) {
  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  if (!use_cache_ || command_line->HasSwitch(switches::kDisableHttpCache))
+  if (command_line->HasSwitch(switches::kDisableHttpCache))
    return new NoCacheBackend;
  else
    return brightray::BrowserContext::CreateHttpCacheBackendFactory(base_path);
@@ -194,27 +176,16 @@ content::PermissionManager* AtomBrowserContext::GetPermissionManager() {
  return permission_manager_.get();
 }

-std::unique_ptr<net::CertVerifier> AtomBrowserContext::CreateCertVerifier() {
-  return base::WrapUnique(new AtomCertVerifier(ct_delegate_.get()));
+scoped_ptr<net::CertVerifier> AtomBrowserContext::CreateCertVerifier() {
+  DCHECK(!cert_verifier_);
+  cert_verifier_ = new AtomCertVerifier;
+  return make_scoped_ptr(cert_verifier_);
 }

 net::SSLConfigService* AtomBrowserContext::CreateSSLConfigService() {
  return new AtomSSLConfigService;
 }

-std::vector<std::string> AtomBrowserContext::GetCookieableSchemes() {
-  auto default_schemes = brightray::BrowserContext::GetCookieableSchemes();
-  const auto& standard_schemes = atom::api::GetStandardSchemes();
-  default_schemes.insert(default_schemes.end(),
-                         standard_schemes.begin(), standard_schemes.end());
-  return default_schemes;
-}
-
-net::TransportSecurityState::RequireCTDelegate*
-AtomBrowserContext::GetRequireCTDelegate() {
-  return ct_delegate_.get();
-}
-
 void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
  pref_registry->RegisterFilePathPref(prefs::kSelectFileLastDirectory,
                                      base::FilePath());
@@ -222,31 +193,26 @@ void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
  PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &download_dir);
  pref_registry->RegisterFilePathPref(prefs::kDownloadDefaultDirectory,
                                      download_dir);
-  pref_registry->RegisterDictionaryPref(prefs::kDevToolsFileSystemPaths);
 }

-AtomBlobReader* AtomBrowserContext::GetBlobReader() {
-  if (!blob_reader_.get()) {
-    content::ChromeBlobStorageContext* blob_context =
-        content::ChromeBlobStorageContext::GetFor(this);
-    storage::FileSystemContext* file_system_context =
-        content::BrowserContext::GetStoragePartition(
-            this, nullptr)->GetFileSystemContext();
-    blob_reader_.reset(new AtomBlobReader(blob_context,
-                                          file_system_context));
-  }
-  return blob_reader_.get();
+bool AtomBrowserContext::AllowNTLMCredentialsForDomain(const GURL& origin) {
+  if (allow_ntlm_everywhere_)
+    return true;
+  return Delegate::AllowNTLMCredentialsForDomain(origin);
 }

-// static
-scoped_refptr<AtomBrowserContext> AtomBrowserContext::From(
-    const std::string& partition, bool in_memory,
-    const base::DictionaryValue& options) {
-  auto browser_context = brightray::BrowserContext::Get(partition, in_memory);
-  if (browser_context)
-    return static_cast<AtomBrowserContext*>(browser_context.get());
-
-  return new AtomBrowserContext(partition, in_memory, options);
+void AtomBrowserContext::AllowNTLMCredentialsForAllDomains(bool should_allow) {
+  allow_ntlm_everywhere_ = should_allow;
 }

 }  // namespace atom
+
+namespace brightray {
+
+// static
+scoped_refptr<BrowserContext> BrowserContext::Create(
+    const std::string& partition, bool in_memory) {
+  return make_scoped_refptr(new atom::AtomBrowserContext(partition, in_memory));
+}
+
+}  // namespace brightray
--- a/atom/browser/atom_browser_context.h
+++ b/atom/browser/atom_browser_context.h
@@ -6,45 +6,34 @@
 #define ATOM_BROWSER_ATOM_BROWSER_CONTEXT_H_

 #include <string>
-#include <vector>

-#include "atom/browser/net/atom_cookie_delegate.h"
 #include "brightray/browser/browser_context.h"
-#include "net/cookies/cookie_monster.h"

 namespace atom {

-class AtomBlobReader;
-class AtomCTDelegate;
 class AtomDownloadManagerDelegate;
+class AtomCertVerifier;
 class AtomNetworkDelegate;
 class AtomPermissionManager;
+class AtomURLRequestJobFactory;
 class WebViewManager;

 class AtomBrowserContext : public brightray::BrowserContext {
 public:
-  // Get or create the BrowserContext according to its |partition| and
-  // |in_memory|. The |options| will be passed to constructor when there is no
-  // existing BrowserContext.
-  static scoped_refptr<AtomBrowserContext> From(
-      const std::string& partition, bool in_memory,
-      const base::DictionaryValue& options = base::DictionaryValue());
-
-  void SetUserAgent(const std::string& user_agent);
+  AtomBrowserContext(const std::string& partition, bool in_memory);
+  ~AtomBrowserContext() override;

  // brightray::URLRequestContextGetter::Delegate:
  net::NetworkDelegate* CreateNetworkDelegate() override;
-  net::CookieMonsterDelegate* CreateCookieDelegate() override;
  std::string GetUserAgent() override;
-  std::unique_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
-      content::ProtocolHandlerMap* protocol_handlers) override;
+  scoped_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
+      content::ProtocolHandlerMap* handlers,
+      content::URLRequestInterceptorScopedVector* interceptors) override;
  net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
      const base::FilePath& base_path) override;
-  std::unique_ptr<net::CertVerifier> CreateCertVerifier() override;
+  scoped_ptr<net::CertVerifier> CreateCertVerifier() override;
  net::SSLConfigService* CreateSSLConfigService() override;
-  std::vector<std::string> GetCookieableSchemes() override;
-  net::TransportSecurityState::RequireCTDelegate* GetRequireCTDelegate()
-      override;
+  bool AllowNTLMCredentialsForDomain(const GURL& auth_origin) override;

  // content::BrowserContext:
  content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
@@ -54,29 +43,25 @@ class AtomBrowserContext : public brightray::BrowserContext {
  // brightray::BrowserContext:
  void RegisterPrefs(PrefRegistrySimple* pref_registry) override;

-  AtomBlobReader* GetBlobReader();
-  AtomNetworkDelegate* network_delegate() const { return network_delegate_; }
-  AtomCookieDelegate* cookie_delegate() const {
-    return cookie_delegate_.get();
-  }
+  void AllowNTLMCredentialsForAllDomains(bool should_allow);

- protected:
-  AtomBrowserContext(const std::string& partition, bool in_memory,
-                     const base::DictionaryValue& options);
-  ~AtomBrowserContext() override;
+  AtomCertVerifier* cert_verifier() const { return cert_verifier_; }
+
+  AtomURLRequestJobFactory* job_factory() const { return job_factory_; }
+
+  AtomNetworkDelegate* network_delegate() const { return network_delegate_; }

 private:
-  std::unique_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
-  std::unique_ptr<WebViewManager> guest_manager_;
-  std::unique_ptr<AtomPermissionManager> permission_manager_;
-  std::unique_ptr<AtomBlobReader> blob_reader_;
-  std::unique_ptr<AtomCTDelegate> ct_delegate_;
-  std::string user_agent_;
-  bool use_cache_;
+  scoped_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
+  scoped_ptr<WebViewManager> guest_manager_;
+  scoped_ptr<AtomPermissionManager> permission_manager_;

  // Managed by brightray::BrowserContext.
+  AtomCertVerifier* cert_verifier_;
+  AtomURLRequestJobFactory* job_factory_;
  AtomNetworkDelegate* network_delegate_;
-  scoped_refptr<AtomCookieDelegate> cookie_delegate_;
+
+  bool allow_ntlm_everywhere_;

  DISALLOW_COPY_AND_ASSIGN(AtomBrowserContext);
 };
--- a/atom/browser/atom_browser_main_parts.cc
+++ b/atom/browser/atom_browser_main_parts.cc
@@ -15,9 +15,8 @@
 #include "atom/common/node_bindings.h"
 #include "atom/common/node_includes.h"
 #include "base/command_line.h"
-#include "base/threading/thread_task_runner_handle.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/browser_process.h"
-#include "content/public/browser/child_process_security_policy.h"
 #include "v8/include/v8-debug.h"

 #if defined(USE_X11)
@@ -33,7 +32,7 @@ void Erase(T* container, typename T::iterator iter) {
 }

 // static
-AtomBrowserMainParts* AtomBrowserMainParts::self_ = nullptr;
+AtomBrowserMainParts* AtomBrowserMainParts::self_ = NULL;

 AtomBrowserMainParts::AtomBrowserMainParts()
    : fake_browser_process_(new BrowserProcess),
@@ -44,20 +43,9 @@ AtomBrowserMainParts::AtomBrowserMainParts()
      gc_timer_(true, true) {
  DCHECK(!self_) << "Cannot have two AtomBrowserMainParts";
  self_ = this;
-  // Register extension scheme as web safe scheme.
-  content::ChildProcessSecurityPolicy::GetInstance()->
-      RegisterWebSafeScheme("chrome-extension");
 }

 AtomBrowserMainParts::~AtomBrowserMainParts() {
-  // Leak the JavascriptEnvironment on exit.
-  // This is to work around the bug that V8 would be waiting for background
-  // tasks to finish on exit, while somehow it waits forever in Electron, more
-  // about this can be found at https://github.com/electron/electron/issues/4767.
-  // On the other handle there is actually no need to gracefully shutdown V8
-  // on exit in the main process, we already ensured all necessary resources get
-  // cleaned up, and it would make quitting faster.
-  ignore_result(js_env_.release());
 }

 // static
@@ -110,26 +98,20 @@ void AtomBrowserMainParts::PostEarlyInitialization() {
  node_debugger_.reset(new NodeDebugger(js_env_->isolate()));

  // Create the global environment.
-  node::Environment* env =
-      node_bindings_->CreateEnvironment(js_env_->context());
+  global_env = node_bindings_->CreateEnvironment(js_env_->context());

  // Make sure node can get correct environment when debugging.
  if (node_debugger_->IsRunning())
-    env->AssignToContext(v8::Debug::GetDebugContext());
+    global_env->AssignToContext(v8::Debug::GetDebugContext());

-  // Add Electron extended APIs.
-  atom_bindings_->BindTo(js_env_->isolate(), env->process_object());
+  // Add atom-shell extended APIs.
+  atom_bindings_->BindTo(js_env_->isolate(), global_env->process_object());

  // Load everything.
-  node_bindings_->LoadEnvironment(env);
-
-  // Wrap the uv loop with global env.
-  node_bindings_->set_uv_env(env);
+  node_bindings_->LoadEnvironment(global_env);
 }

 void AtomBrowserMainParts::PreMainMessageLoopRun() {
-  js_env_->OnMessageLoopCreated();
-
  // Run user's main script before most things get initialized, so we can have
  // a chance to setup everything.
  node_bindings_->PrepareMessageLoop();
@@ -142,8 +124,9 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
  // Start idle gc.
  gc_timer_.Start(
      FROM_HERE, base::TimeDelta::FromMinutes(1),
-      base::Bind(&v8::Isolate::LowMemoryNotification,
-                 base::Unretained(js_env_->isolate())));
+      base::Bind(base::IgnoreResult(&v8::Isolate::IdleNotification),
+                 base::Unretained(js_env_->isolate()),
+                 1000));

  brightray::BrowserMainParts::PreMainMessageLoopRun();
  bridge_task_runner_->MessageLoopIsReady();
@@ -154,10 +137,9 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
 #endif

 #if !defined(OS_MACOSX)
-  // The corresponding call in macOS is in AtomApplicationDelegate.
+  // The corresponding call in OS X is in AtomApplicationDelegate.
  Browser::Get()->WillFinishLaunching();
-  std::unique_ptr<base::DictionaryValue> empty_info(new base::DictionaryValue);
-  Browser::Get()->DidFinishLaunching(*empty_info);
+  Browser::Get()->DidFinishLaunching();
 #endif
 }

@@ -176,8 +158,6 @@ void AtomBrowserMainParts::PostMainMessageLoopStart() {
 void AtomBrowserMainParts::PostMainMessageLoopRun() {
  brightray::BrowserMainParts::PostMainMessageLoopRun();

-  js_env_->OnMessageLoopDestroying();
-
 #if defined(OS_MACOSX)
  FreeAppDelegate();
 #endif
@@ -192,6 +172,14 @@ void AtomBrowserMainParts::PostMainMessageLoopRun() {
    ++iter;
    callback.Run();
  }
+
+  // Destroy JavaScript environment immediately after running destruction
+  // callbacks.
+  gc_timer_.Stop();
+  node_debugger_.reset();
+  atom_bindings_.reset();
+  node_bindings_.reset();
+  js_env_.reset();
 }

 }  // namespace atom
--- a/atom/browser/atom_browser_main_parts.h
+++ b/atom/browser/atom_browser_main_parts.h
@@ -68,7 +68,7 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
 #endif

  // A fake BrowserProcess object that used to feed the source code from chrome.
-  std::unique_ptr<BrowserProcess> fake_browser_process_;
+  scoped_ptr<BrowserProcess> fake_browser_process_;

  // The gin::PerIsolateData requires a task runner to create, so we feed it
  // with a task runner that will post all work to main loop.
@@ -77,11 +77,11 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
  // Pointer to exit code.
  int* exit_code_;

-  std::unique_ptr<Browser> browser_;
-  std::unique_ptr<JavascriptEnvironment> js_env_;
-  std::unique_ptr<NodeBindings> node_bindings_;
-  std::unique_ptr<AtomBindings> atom_bindings_;
-  std::unique_ptr<NodeDebugger> node_debugger_;
+  scoped_ptr<Browser> browser_;
+  scoped_ptr<JavascriptEnvironment> js_env_;
+  scoped_ptr<NodeBindings> node_bindings_;
+  scoped_ptr<AtomBindings> atom_bindings_;
+  scoped_ptr<NodeDebugger> node_debugger_;

  base::Timer gc_timer_;

--- a/atom/browser/atom_browser_main_parts_mac.mm
+++ b/atom/browser/atom_browser_main_parts_mac.mm
@@ -18,7 +18,7 @@ void AtomBrowserMainParts::PreMainMessageLoopStart() {

  // Set our own application delegate.
  AtomApplicationDelegate* delegate = [[AtomApplicationDelegate alloc] init];
-  [NSApp setDelegate:delegate];
+  [NSApp setDelegate:(id<NSFileManagerDelegate>)delegate];

  brightray::BrowserMainParts::PreMainMessageLoopStart();

--- a/atom/browser/atom_browser_main_parts_posix.cc
+++ b/atom/browser/atom_browser_main_parts_posix.cc
@@ -43,7 +43,7 @@ void GracefulShutdownHandler(int signal) {
  struct sigaction action;
  memset(&action, 0, sizeof(action));
  action.sa_handler = SIG_DFL;
-  RAW_CHECK(sigaction(signal, &action, nullptr) == 0);
+  RAW_CHECK(sigaction(signal, &action, NULL) == 0);

  RAW_CHECK(g_pipe_pid == getpid());
  RAW_CHECK(g_shutdown_pipe_write_fd != -1);
@@ -171,7 +171,7 @@ void AtomBrowserMainParts::HandleSIGCHLD() {
  struct sigaction action;
  memset(&action, 0, sizeof(action));
  action.sa_handler = SIGCHLDHandler;
-  CHECK_EQ(sigaction(SIGCHLD, &action, nullptr), 0);
+  CHECK_EQ(sigaction(SIGCHLD, &action, NULL), 0);
 }

 void AtomBrowserMainParts::HandleShutdownSignals() {
@@ -211,15 +211,15 @@ void AtomBrowserMainParts::HandleShutdownSignals() {
  struct sigaction action;
  memset(&action, 0, sizeof(action));
  action.sa_handler = SIGTERMHandler;
-  CHECK_EQ(sigaction(SIGTERM, &action, nullptr), 0);
+  CHECK_EQ(sigaction(SIGTERM, &action, NULL), 0);
  // Also handle SIGINT - when the user terminates the browser via Ctrl+C. If
  // the browser process is being debugged, GDB will catch the SIGINT first.
  action.sa_handler = SIGINTHandler;
-  CHECK_EQ(sigaction(SIGINT, &action, nullptr), 0);
+  CHECK_EQ(sigaction(SIGINT, &action, NULL), 0);
  // And SIGHUP, for when the terminal disappears. On shutdown, many Linux
  // distros send SIGHUP, SIGTERM, and then SIGKILL.
  action.sa_handler = SIGHUPHandler;
-  CHECK_EQ(sigaction(SIGHUP, &action, nullptr), 0);
+  CHECK_EQ(sigaction(SIGHUP, &action, NULL), 0);
 }

 }  // namespace atom
--- a/atom/browser/atom_download_manager_delegate.cc
+++ b/atom/browser/atom_download_manager_delegate.cc
@@ -12,8 +12,8 @@
 #include "atom/browser/ui/file_dialog.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
+#include "base/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
-#include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
@@ -35,17 +35,6 @@ AtomDownloadManagerDelegate::~AtomDownloadManagerDelegate() {
  }
 }

-void AtomDownloadManagerDelegate::GetItemSavePath(content::DownloadItem* item,
-                                                  base::FilePath* path) {
-  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)
-    *path = download->GetSavePath();
-}
-
 void AtomDownloadManagerDelegate::CreateDownloadPath(
    const GURL& url,
    const std::string& content_disposition,
@@ -60,7 +49,7 @@ void AtomDownloadManagerDelegate::CreateDownloadPath(
                                              std::string(),
                                              suggested_filename,
                                              mime_type,
-                                              "download");
+                                              std::string());

  if (!base::PathExists(default_download_path))
    base::CreateDirectory(default_download_path);
@@ -71,7 +60,7 @@ void AtomDownloadManagerDelegate::CreateDownloadPath(
 }

 void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
-    uint32_t download_id,
+    uint32 download_id,
    const content::DownloadTargetCallback& callback,
    const base::FilePath& default_path) {
  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -81,32 +70,18 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
    return;

  NativeWindow* window = nullptr;
-  content::WebContents* web_contents = item->GetWebContents();
-  auto relay = web_contents ? NativeWindowRelay::FromWebContents(web_contents)
-                            : nullptr;
+  auto relay = NativeWindowRelay::FromWebContents(item->GetWebContents());
  if (relay)
    window = relay->window.get();

  base::FilePath path;
-  GetItemSavePath(item, &path);
-  // Show save dialog if save path was not set already on item
-  if (path.empty() && file_dialog::ShowSaveDialog(window, item->GetURL().spec(),
-                                                  "", default_path,
-                                                  file_dialog::Filters(),
-                                                  &path)) {
+  if (file_dialog::ShowSaveDialog(window, item->GetURL().spec(), default_path,
+                                  file_dialog::Filters(), &path)) {
    // Remember the last selected download directory.
    AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(
        download_manager_->GetBrowserContext());
    browser_context->prefs()->SetFilePath(prefs::kDownloadDefaultDirectory,
                                          path.DirName());
-
-    v8::Isolate* isolate = v8::Isolate::GetCurrent();
-    v8::Locker locker(isolate);
-    v8::HandleScope handle_scope(isolate);
-    api::DownloadItem* download_item = api::DownloadItem::FromWrappedClass(
-        isolate, item);
-    if (download_item)
-      download_item->SetSavePath(path);
  }

  // Running the DownloadTargetCallback with an empty FilePath signals that the
@@ -136,14 +111,22 @@ bool AtomDownloadManagerDelegate::DetermineDownloadTarget(
  }

  // Try to get the save path from JS wrapper.
-  base::FilePath save_path;
-  GetItemSavePath(download, &save_path);
-  if (!save_path.empty()) {
-    callback.Run(save_path,
-                 content::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-                 content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-                 save_path);
-    return true;
+  {
+    v8::Isolate* isolate = v8::Isolate::GetCurrent();
+    v8::Locker locker(isolate);
+    v8::HandleScope handle_scope(isolate);
+    api::DownloadItem* download_item = api::DownloadItem::FromWrappedClass(
+        isolate, download);
+    if (download_item) {
+      base::FilePath save_path = download_item->GetSavePath();
+      if (!save_path.empty()) {
+        callback.Run(save_path,
+                     content::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
+                     content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
+                     save_path);
+        return true;
+      }
+    }
  }

  AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(
@@ -177,7 +160,7 @@ bool AtomDownloadManagerDelegate::ShouldOpenDownload(

 void AtomDownloadManagerDelegate::GetNextId(
    const content::DownloadIdCallback& callback) {
-  static uint32_t next_id = content::DownloadItem::kInvalidId + 1;
+  static uint32 next_id = content::DownloadItem::kInvalidId + 1;
  callback.Run(next_id++);
 }

--- a/atom/browser/atom_download_manager_delegate.h
+++ b/atom/browser/atom_download_manager_delegate.h
@@ -31,7 +31,7 @@ class AtomDownloadManagerDelegate : public content::DownloadManagerDelegate {
                          const std::string& mime_type,
                          const base::FilePath& path,
                          const CreateDownloadPathCallback& callback);
-  void OnDownloadPathGenerated(uint32_t download_id,
+  void OnDownloadPathGenerated(uint32 download_id,
                               const content::DownloadTargetCallback& callback,
                               const base::FilePath& default_path);

@@ -46,9 +46,6 @@ class AtomDownloadManagerDelegate : public content::DownloadManagerDelegate {
  void GetNextId(const content::DownloadIdCallback& callback) override;

 private:
-  // Get the save path set on the associated api::DownloadItem object
-  void GetItemSavePath(content::DownloadItem* item, base::FilePath* path);
-
  content::DownloadManager* download_manager_;
  base::WeakPtrFactory<AtomDownloadManagerDelegate> weak_ptr_factory_;

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Cheng Zhao	40066ca343	Bump v0.36.12	2016-03-27 10:40:57 +09:00
Cheng Zhao	6671e78f5d	Run callback of setDestructor immediately when GC happens Fix #4733.	2016-03-27 10:40:44 +09:00
Cheng Zhao	0480e32f99	Update brightray: fix crash when using notification on Windows	2016-03-27 10:40:03 +09:00