Merge branch 'master' into chrome51

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

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

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

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

diff --cc atom/browser/atom_browser_context.h
index b208ca9,4e206a3..028f5d1
--- 1/atom/browser/atom_browser_context.h
--- 2/atom/browser/atom_browser_context.h
+++ b/atom/browser/atom_browser_context.h
@@@ -31,9 -31,8 +31,8 @@@ class AtomBrowserContext : public brigh
        content::URLRequestInterceptorScopedVector* interceptors) override;
    net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
        const base::FilePath& base_path) override;
 -  scoped_ptr<net::CertVerifier> CreateCertVerifier() override;
 +  std::unique_ptr<net::CertVerifier> CreateCertVerifier() override;
    net::SSLConfigService* CreateSSLConfigService() override;
-   bool AllowNTLMCredentialsForDomain(const GURL& auth_origin) override;
  
    // content::BrowserContext:
    content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;

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

diff --cc atom/browser/native_window_mac.mm
Simple merge