Merge branch 'master' into ben/electron-sandbox

src/vs/code/electron-main/auth.ts

@@ -59,8 +59,7 @@ export class ProxyAuthHandler extends Disposable {
 			title: 'VS Code',
 			webPreferences: {
 				nodeIntegration: true,
-				webviewTag: true,
-				enableWebSQL: false
+				webviewTag: true
 			}
 		};
 

src/vs/code/electron-main/sharedProcess.ts

@@ -46,7 +46,6 @@ export class SharedProcess implements ISharedProcess {
 				images: false,
 				nodeIntegration: true,
 				webgl: false,
-				enableWebSQL: false,
 				disableBlinkFeatures: 'Auxclick' // do NOT change, allows us to identify this window as shared-process in the process explorer
 			}
 		});

src/vs/code/electron-main/window.ts

@@ -166,8 +166,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 					preload: URI.parse(this.doGetPreloadUrl()).fsPath,
 					nodeIntegration: true,
 					nodeIntegrationInWorker: RUN_TEXTMATE_IN_WORKER,
-					webviewTag: true,
-					enableWebSQL: false
+					webviewTag: true
 				}
 			};