From 5bb8da60737802d9c4e09b2c813ec93539fb92be Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jun 2016 14:57:35 +0900
Subject: [PATCH] Explicitly initialize session before webContents

---
 lib/browser/api/app.js          | 5 +++--
 lib/browser/api/web-contents.js | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index f8a531626b..09835a792e 100644
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -1,6 +1,7 @@
 'use strict'
 
-const {deprecate, Menu, session} = require('electron')
+const electron = require('electron')
+const {deprecate, Menu} = electron
 const {EventEmitter} = require('events')
 
 const bindings = process.atomBinding('app')
@@ -49,7 +50,7 @@ app.allowNTLMCredentialsForAllDomains = function (allow) {
   if (!this.isReady()) {
     this.commandLine.appendSwitch('auth-server-whitelist', domains)
   } else {
-    session.defaultSession.allowNTLMCredentialsForDomains(domains)
+    electron.session.defaultSession.allowNTLMCredentialsForDomains(domains)
   }
 }
 
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index cb8cf41e3a..059f204e1e 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -1,7 +1,11 @@
 'use strict'
 
 const {EventEmitter} = require('events')
-const {ipcMain, Menu, NavigationController} = require('electron')
+const {ipcMain, session, Menu, NavigationController} = require('electron')
+
+// session is not used here, the purpose is to make sure session is initalized
+// before the webContents module.
+session
 
 const binding = process.atomBinding('web_contents')
 const debuggerBinding = process.atomBinding('debugger')