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

Unified Diff: content/browser/zygote_host/zygote_host_impl_linux.cc

Issue 877153005: sandbox: extract SetuidSandboxHost code from SetuidSandboxClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to rickyz feedback Created 5 years, 10 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
Index: content/browser/zygote_host/zygote_host_impl_linux.cc
diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
index f9e69a2b13d80e8c68b2097a71847599530ac083..3831753a15dac17b4e56eacdbef0447d130fa66b 100644
--- a/content/browser/zygote_host/zygote_host_impl_linux.cc
+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
@@ -38,7 +38,7 @@
#include "content/public/browser/content_browser_client.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/result_codes.h"
-#include "sandbox/linux/suid/client/setuid_sandbox_client.h"
+#include "sandbox/linux/suid/client/setuid_sandbox_host.h"
#include "sandbox/linux/suid/common/sandbox.h"
#include "ui/base/ui_base_switches.h"
#include "ui/gfx/switches.h"
@@ -151,11 +151,11 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
base::ScopedFD dummy_fd;
if (using_suid_sandbox_) {
- scoped_ptr<sandbox::SetuidSandboxClient>
- sandbox_client(sandbox::SetuidSandboxClient::Create());
- sandbox_client->PrependWrapper(&cmd_line);
- sandbox_client->SetupLaunchOptions(&options, &fds_to_map, &dummy_fd);
- sandbox_client->SetupLaunchEnvironment();
+ scoped_ptr<sandbox::SetuidSandboxHost>
+ sandbox_host(sandbox::SetuidSandboxHost::Create());
+ sandbox_host->PrependWrapper(&cmd_line);
+ sandbox_host->SetupLaunchOptions(&options, &fds_to_map, &dummy_fd);
+ sandbox_host->SetupLaunchEnvironment();
}
options.fds_to_remap = &fds_to_map;

Powered by Google App Engine
This is Rietveld 408576698