diff --git a/atom/app/atom_main_delegate.cc b/atom/app/atom_main_delegate.cc index e4e1bc2421fd..fdf76f3cb291 100644 --- a/atom/app/atom_main_delegate.cc +++ b/atom/app/atom_main_delegate.cc @@ -154,7 +154,7 @@ content::ContentBrowserClient* AtomMainDelegate::CreateContentBrowserClient() { content::ContentRendererClient* AtomMainDelegate::CreateContentRendererClient() { if (base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableSandbox) || + switches::kEnableSandbox) || !base::CommandLine::ForCurrentProcess()->HasSwitch( ::switches::kNoSandbox)) { renderer_client_.reset(new AtomSandboxedRendererClient); diff --git a/spec/api-app-spec.js b/spec/api-app-spec.js index d22499e720b5..9bfb0086a37d 100644 --- a/spec/api-app-spec.js +++ b/spec/api-app-spec.js @@ -567,7 +567,7 @@ describe('app module', function () { }) }) - describe.only('mixed sandbox option', function () { + describe('mixed sandbox option', function () { // FIXME Get these specs running on Linux if (process.platform === 'linux') return diff --git a/spec/fixtures/api/mixed-sandbox-app/main.js b/spec/fixtures/api/mixed-sandbox-app/main.js index 4c823490e20c..19b69e0189b1 100644 --- a/spec/fixtures/api/mixed-sandbox-app/main.js +++ b/spec/fixtures/api/mixed-sandbox-app/main.js @@ -42,8 +42,8 @@ app.once('ready', () => { let connected = false function finish () { - if (connected && argv.sandbox != null && argv.noSandbox != null - && argv.noSandboxDevtools != null && argv.sandboxDevtools != null) { + if (connected && argv.sandbox != null && argv.noSandbox != null && + argv.noSandboxDevtools != null && argv.sandboxDevtools != null) { client.once('end', () => { app.exit(0) })