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

Unified Diff: content/browser/browser_main_loop.cc

Issue 1840923002: Removed setuid Sandbox Check as Per Bug#598454 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added conditional to keep the sandbox in ChromeOS 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 | « AUTHORS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 3c39e531a9aea3f03cfb018a0ee5430a5b2bf243..45254d298e861c1df8a5e5ffefa54ee9ed7698a1 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -192,7 +192,7 @@
namespace content {
namespace {
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_CHROMEOS)
void SetupSandbox(const base::CommandLine& parsed_command_line) {
TRACE_EVENT0("startup", "SetupSandbox");
base::FilePath sandbox_binary;
@@ -228,6 +228,16 @@ void SetupSandbox(const base::CommandLine& parsed_command_line) {
}
#endif
+
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+void SetupSandbox() {
mdempsky 2016/04/01 23:25:42 I don't understand why you're duplicating all of t
+ base::FilePath sandbox_binary;
+ RenderSandboxHostLinux::GetInstance()->Init();
+ ZygoteHostImpl::GetInstance()->Init(sandbox_binary.value());
+ *GetGenericZygote() = CreateZygote();
+ RenderProcessHostImpl::EarlyZygoteLaunch();
+}
+#endif
#if defined(USE_GLIB)
static void GLibLogHandler(const gchar* log_domain,
GLogLevelFlags log_level,
@@ -440,11 +450,8 @@ void BrowserMainLoop::EarlyInitialization() {
TRACK_SCOPED_REGION("Startup", "BrowserMainLoop::EarlyInitialization");
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
- // No thread should be created before this call, as SetupSandbox()
- // will end-up using fork().
- SetupSandbox(parsed_command_line_);
+ SetupSandbox();
mdempsky 2016/04/01 23:25:43 This won't compile on Chrome OS: your SetupSandbox
#endif
-
#if defined(USE_X11)
if (UsingInProcessGpu()) {
if (!gfx::InitializeThreadedX11()) {
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698