Merge branch 'master' into chrome52

diff --cc atom/app/node_main.cc
index 3eaeed3,e711f48..040b4b6
--- 1/atom/app/node_main.cc
--- 2/atom/app/node_main.cc
+++ b/atom/app/node_main.cc
@@@ -7,10 -7,9 +7,9 @@@
  #include "atom/app/uv_task_runner.h"
  #include "atom/browser/javascript_environment.h"
  #include "atom/browser/node_debugger.h"
- #include "atom/common/node_includes.h"
  #include "base/command_line.h"
  #include "base/feature_list.h"
 -#include "base/thread_task_runner_handle.h"
 +#include "base/threading/thread_task_runner_handle.h"
  #include "gin/array_buffer.h"
  #include "gin/public/isolate_holder.h"
  #include "gin/v8_initializer.h"

diff --cc atom/browser/api/atom_api_menu.h
Simple merge

diff --cc atom/browser/api/atom_api_menu_views.cc
index c4040e3,ceee463..a6fd802
--- 1/atom/browser/api/atom_api_menu_views.cc
--- 2/atom/browser/api/atom_api_menu_views.cc
+++ b/atom/browser/api/atom_api_menu_views.cc
@@@ -5,8 -5,9 +5,9 @@@
  #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/gfx/screen.h"
 +#include "ui/display/screen.h"
  #include "ui/views/controls/menu/menu_runner.h"
  
  namespace atom {

diff --cc atom/browser/api/atom_api_protocol.cc
index 2b20dae,6f4f158..4019a96
--- 1/atom/browser/api/atom_api_protocol.cc
--- 2/atom/browser/api/atom_api_protocol.cc
+++ b/atom/browser/api/atom_api_protocol.cc
@@@ -26,8 -27,21 +27,20 @@@ namespace atom 
  
  namespace api {
  
+ namespace {
+ 
+ // 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
+ 
  Protocol::Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context)
 -    : request_context_getter_(static_cast<brightray::URLRequestContextGetter*>(
 -          browser_context->GetRequestContext())),
 +    : request_context_getter_(browser_context->GetRequestContext()),
        weak_factory_(this) {
    Init(isolate);
  }

diff --cc atom/browser/api/atom_api_session.cc
Simple merge

diff --cc atom/browser/api/atom_api_tray.h
Simple merge

diff --cc atom/browser/atom_browser_context.cc
index 3061716,3d42fe5..d87047c
--- 1/atom/browser/atom_browser_context.cc
--- 2/atom/browser/atom_browser_context.cc
+++ b/atom/browser/atom_browser_context.cc
@@@ -174,7 -178,7 +178,7 @@@ content::PermissionManager* AtomBrowser
  }
  
  std::unique_ptr<net::CertVerifier> AtomBrowserContext::CreateCertVerifier() {
-   return base::WrapUnique(cert_verifier_);
 -  return std::unique_ptr<net::CertVerifier>(new AtomCertVerifier);
++  return base::WrapUnique(new AtomCertVerifier);
  }
  
  net::SSLConfigService* AtomBrowserContext::CreateSSLConfigService() {

diff --cc atom/browser/atom_browser_main_parts.cc
Simple merge

diff --cc atom/browser/browser_win.cc
Simple merge

diff --cc atom/browser/native_window.cc
Simple merge

diff --cc atom/browser/native_window.h
index 6c7ac82,fb4f021..b932c63
--- 1/atom/browser/native_window.h
--- 2/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@@ -12,7 -11,9 +12,8 @@@
  
  #include "atom/browser/native_window_observer.h"
  #include "atom/browser/ui/accelerator_util.h"
+ #include "atom/browser/ui/atom_menu_model.h"
  #include "base/cancelable_callback.h"
 -#include "base/memory/scoped_ptr.h"
  #include "base/memory/weak_ptr.h"
  #include "base/observer_list.h"
  #include "base/supports_user_data.h"

diff --cc atom/browser/native_window_views.cc
Simple merge

diff --cc atom/browser/net/asar/url_request_asar_job.cc
Simple merge

diff --cc atom/browser/ui/tray_icon_cocoa.mm
Simple merge

diff --cc atom/browser/ui/views/menu_delegate.h
index bdc22fb,c28bb3b..f813f9c
--- 1/atom/browser/ui/views/menu_delegate.h
--- 2/atom/browser/ui/views/menu_delegate.h
+++ b/atom/browser/ui/views/menu_delegate.h
@@@ -5,8 -5,8 +5,9 @@@
  #ifndef ATOM_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
  #define ATOM_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
  
 -#include "base/memory/scoped_ptr.h"
 +#include <memory>
 +
+ #include "atom/browser/ui/atom_menu_model.h"
  #include "ui/views/controls/menu/menu_delegate.h"
  
  namespace views {

diff --cc atom/browser/ui/win/notify_icon.cc
Simple merge

diff --cc atom/browser/ui/win/notify_icon.h
Simple merge

diff --cc atom/common/api/atom_api_native_image.cc
Simple merge

diff --cc atom/common/native_mate_converters/v8_value_converter.cc
index af2cbae,ddff439..6d159d4
--- 1/atom/common/native_mate_converters/v8_value_converter.cc
--- 2/atom/common/native_mate_converters/v8_value_converter.cc
+++ b/atom/common/native_mate_converters/v8_value_converter.cc
@@@ -10,9 -9,11 +10,10 @@@
  #include <utility>
  
  #include "base/logging.h"
 -#include "base/memory/scoped_ptr.h"
  #include "base/values.h"
  #include "native_mate/dictionary.h"
- #include "vendor/node/src/node_buffer.h"
+ 
+ #include "atom/common/node_includes.h"
  
  namespace atom {
  

diff --cc atom/renderer/atom_renderer_client.cc
index 7861f9d,07f0a0c..d2c341f
--- 1/atom/renderer/atom_renderer_client.cc
--- 2/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@@ -317,20 -315,8 +315,8 @@@ content::BrowserPluginDelegate* AtomRen
    }
  }
  
- void AtomRendererClient::GetNavigationErrorStrings(
-     content::RenderFrame* render_frame,
-     const blink::WebURLRequest& failed_request,
-     const blink::WebURLError& error,
-     std::string* error_html,
-     base::string16* error_description) {
-   if (!error_description)
-     return;
- 
-   *error_description = base::UTF8ToUTF16(net::ErrorToShortString(error.reason));
- }
- 
 -void AtomRendererClient::AddKeySystems(
 -    std::vector<media::KeySystemInfo>* key_systems) {
 +void AtomRendererClient::AddSupportedKeySystems(
 +    std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems) {
    AddChromeKeySystems(key_systems);
  }
  

diff --cc atom/renderer/atom_renderer_client.h
index 3b6f8a5,9cf6eaa..5419692
--- 1/atom/renderer/atom_renderer_client.h
--- 2/atom/renderer/atom_renderer_client.h
+++ b/atom/renderer/atom_renderer_client.h
@@@ -57,14 -57,7 +57,9 @@@ class AtomRendererClient : public conte
        content::RenderFrame* render_frame,
        const std::string& mime_type,
        const GURL& original_url) override;
-   void GetNavigationErrorStrings(content::RenderFrame* render_frame,
-                                  const blink::WebURLRequest& failed_request,
-                                  const blink::WebURLError& error,
-                                  std::string* error_html,
-                                  base::string16* error_description) override;
 -  void AddKeySystems(std::vector<media::KeySystemInfo>* key_systems) override;
 +  void AddSupportedKeySystems(
 +      std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems)
 +      override;
  
    std::unique_ptr<NodeBindings> node_bindings_;
    std::unique_ptr<AtomBindings> atom_bindings_;

diff --cc common.gypi
Simple merge

diff --cc docs/api/browser-window.md
Simple merge

diff --cc vendor/brightray
index df6f564,91abdb0..38bdbe0
--- 1/vendor/brightray
--- 2/vendor/brightray
+++ b/vendor/brightray
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit df6f56413fe226095d68435320d0986f92a412ef
 -Subproject commit 91abdb01a1825c12522fd5fc2349a7ba9a091a48
++Subproject commit 38bdbe0c926b47779a45f2cf5f55105cc818a89b