Separate LoadEnvironment from CreateEnvironment

atom/browser/atom_browser_main_parts.cc

@@ -63,8 +63,9 @@ void AtomBrowserMainParts::PostEarlyInitialization() {
   // Support the "--debug" switch.
   node_debugger_.reset(new NodeDebugger(js_env_->isolate()));
 
-  // Create the global environment.
+  // Create and load the global environment.
   global_env = node_bindings_->CreateEnvironment(js_env_->context());
+  node_bindings_->LoadEnvironment(global_env);
 
   // Make sure node can get correct environment when debugging.
   if (node_debugger_->IsRunning())

atom/common/node_bindings.cc

@@ -247,11 +247,13 @@ node::Environment* NodeBindings::CreateEnvironment(
   env->set_process_object(process_object);
 
   SetupProcessObject(env, argc, argv, exec_argc, exec_argv);
-  LoadEnvironment(env);
-
   return env;
 }
 
+void NodeBindings::LoadEnvironment(node::Environment* env) {
+  node::LoadEnvironment(env);
+}
+
 void NodeBindings::PrepareMessageLoop() {
   DCHECK(!is_browser_ || BrowserThread::CurrentlyOn(BrowserThread::UI));
 

atom/common/node_bindings.h

@@ -32,6 +32,9 @@ class NodeBindings {
   // Create the environment and load node.js.
   virtual node::Environment* CreateEnvironment(v8::Handle<v8::Context> context);
 
+  // Load node.js in the environment.
+  void LoadEnvironment(node::Environment* env);
+
   // Prepare for message loop integration.
   virtual void PrepareMessageLoop();
 

atom/renderer/atom_renderer_client.cc

@@ -148,6 +148,7 @@ void AtomRendererClient::DidCreateScriptContext(blink::WebFrame* frame,
 
   // Setup node environment for each window.
   node::Environment* env = node_bindings_->CreateEnvironment(context);
+  node_bindings_->LoadEnvironment(env);
 
   // Add atom-shell extended APIs.
   atom_bindings_->BindToFrame(frame);