diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc index e31ebc4147e..f09f094bf42 100644 --- a/atom/browser/atom_browser_context.cc +++ b/atom/browser/atom_browser_context.cc @@ -13,7 +13,6 @@ #include "base/command_line.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/worker_pool.h" -#include "chrome/browser/browser_process.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/url_constants.h" #include "net/ftp/ftp_network_layer.h" @@ -40,8 +39,7 @@ class NoCacheBackend : public net::HttpCache::BackendFactory { } // namespace AtomBrowserContext::AtomBrowserContext() - : fake_browser_process_(new BrowserProcess), - job_factory_(new AtomURLRequestJobFactory) { + : job_factory_(new AtomURLRequestJobFactory) { } AtomBrowserContext::~AtomBrowserContext() { diff --git a/atom/browser/atom_browser_context.h b/atom/browser/atom_browser_context.h index ab28c3e81a0..2f2efc94433 100644 --- a/atom/browser/atom_browser_context.h +++ b/atom/browser/atom_browser_context.h @@ -7,8 +7,6 @@ #include "brightray/browser/browser_context.h" -class BrowserProcess; - namespace atom { class AtomURLRequestJobFactory; @@ -35,8 +33,6 @@ class AtomBrowserContext : public brightray::BrowserContext { AtomURLRequestJobFactory* job_factory() const { return job_factory_; } private: - // A fake BrowserProcess object that used to feed the source code from chrome. - scoped_ptr fake_browser_process_; scoped_ptr guest_manager_; AtomURLRequestJobFactory* job_factory_; // Weak reference. diff --git a/atom/browser/atom_browser_main_parts.cc b/atom/browser/atom_browser_main_parts.cc index aaf68836d0c..a63ec9a703b 100644 --- a/atom/browser/atom_browser_main_parts.cc +++ b/atom/browser/atom_browser_main_parts.cc @@ -11,6 +11,7 @@ #include "atom/common/api/atom_bindings.h" #include "atom/common/node_bindings.h" #include "base/command_line.h" +#include "chrome/browser/browser_process.h" #include "v8/include/v8-debug.h" #if defined(USE_X11) @@ -25,7 +26,8 @@ namespace atom { AtomBrowserMainParts* AtomBrowserMainParts::self_ = NULL; AtomBrowserMainParts::AtomBrowserMainParts() - : browser_(new Browser), + : fake_browser_process_(new BrowserProcess), + browser_(new Browser), node_bindings_(NodeBindings::Create(true)), atom_bindings_(new AtomBindings), gc_timer_(true, true) { diff --git a/atom/browser/atom_browser_main_parts.h b/atom/browser/atom_browser_main_parts.h index 6ca0686655b..c7d688f7c32 100644 --- a/atom/browser/atom_browser_main_parts.h +++ b/atom/browser/atom_browser_main_parts.h @@ -8,6 +8,8 @@ #include "base/timer/timer.h" #include "brightray/browser/browser_main_parts.h" +class BrowserProcess; + namespace atom { class AtomBindings; @@ -41,6 +43,9 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts { void SetDPIFromGSettings(); #endif + // A fake BrowserProcess object that used to feed the source code from chrome. + scoped_ptr fake_browser_process_; + scoped_ptr browser_; scoped_ptr js_env_; scoped_ptr node_bindings_;