Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3814)

Unified Diff: chrome/service/service_utility_process_host.cc

Issue 1851213002: Remove sandbox on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nacl compile issues Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chrome_elf/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/service/service_utility_process_host.cc
diff --git a/chrome/service/service_utility_process_host.cc b/chrome/service/service_utility_process_host.cc
index ee38b9b5b7e85077d1c90c58678b858579b65c63..48533151023956bbe1c0e5249a6484f6ce34f37a 100644
--- a/chrome/service/service_utility_process_host.cc
+++ b/chrome/service/service_utility_process_host.cc
@@ -31,8 +31,6 @@
#include "content/public/common/sandboxed_process_launcher_delegate.h"
#include "ipc/ipc_switches.h"
#include "printing/emf_win.h"
-#include "sandbox/win/src/sandbox_policy.h"
-#include "sandbox/win/src/sandbox_types.h"
#include "ui/base/ui_base_switches.h"
#if defined(OS_WIN)
@@ -72,9 +70,6 @@ class ServiceSandboxedProcessLauncherDelegate
ServiceSandboxedProcessLauncherDelegate() {}
bool PreSpawnTarget(sandbox::TargetPolicy* policy) override {
- // Ignore result of SetAlternateDesktop. Service process may run as windows
- // service and it fails to create a window station.
- base::IgnoreResult(policy->SetAlternateDesktop(false));
return true;
}
@@ -245,14 +240,9 @@ bool ServiceUtilityProcessHost::StartProcess(bool no_sandbox) {
bool ServiceUtilityProcessHost::Launch(base::CommandLine* cmd_line,
bool no_sandbox) {
- if (no_sandbox) {
- cmd_line->AppendSwitch(switches::kNoSandbox);
- process_ = base::LaunchProcess(*cmd_line, base::LaunchOptions());
- } else {
- ServiceSandboxedProcessLauncherDelegate delegate;
- process_ = content::StartSandboxedProcess(
- &delegate, cmd_line, base::HandlesToInheritVector());
- }
+ cmd_line->AppendSwitch(switches::kNoSandbox);
+ process_ = base::LaunchProcess(*cmd_line, base::LaunchOptions());
+
return process_.IsValid();
}
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chrome_elf/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698