diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc index 0fcdbad198..888f7f35e5 100644 --- a/atom/browser/atom_browser_context.cc +++ b/atom/browser/atom_browser_context.cc @@ -25,8 +25,7 @@ AtomBrowserContext::AtomBrowserContext() AtomBrowserContext::~AtomBrowserContext() { } -scoped_ptr -AtomBrowserContext::CreateURLRequestJobFactory( +net::URLRequestJobFactory* AtomBrowserContext::CreateURLRequestJobFactory( content::ProtocolHandlerMap* handlers, content::ProtocolHandlerScopedVector* interceptors) { scoped_ptr job_factory(job_factory_); @@ -52,7 +51,7 @@ AtomBrowserContext::CreateURLRequestJobFactory( top_job_factory.Pass(), make_scoped_ptr(*it))); interceptors->weak_clear(); - return top_job_factory.Pass(); + return top_job_factory.release(); } // static diff --git a/atom/browser/atom_browser_context.h b/atom/browser/atom_browser_context.h index b7979074b0..b3aab43664 100644 --- a/atom/browser/atom_browser_context.h +++ b/atom/browser/atom_browser_context.h @@ -22,8 +22,8 @@ class AtomBrowserContext : public brightray::BrowserContext { AtomURLRequestJobFactory* job_factory() const { return job_factory_; } protected: - // brightray::BrowserContext: - virtual scoped_ptr CreateURLRequestJobFactory( + // brightray::URLRequestContextGetter::Delegate: + virtual net::URLRequestJobFactory* CreateURLRequestJobFactory( content::ProtocolHandlerMap* handlers, content::ProtocolHandlerScopedVector* interceptors) OVERRIDE; diff --git a/vendor/brightray b/vendor/brightray index a3eba728ef..f0fe9b5a75 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit a3eba728efe6e80a5e0717f6889131519ab2b2f5 +Subproject commit f0fe9b5a75fee01716589a9594c4d693d7e70ba4