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

Unified Diff: services/shell/runner/host/child_process_base.cc

Issue 2174983002: OS_LINUX and OS_ANDROID are mutually exclusive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « no previous file | services/shell/runner/host/child_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/shell/runner/host/child_process_base.cc
diff --git a/services/shell/runner/host/child_process_base.cc b/services/shell/runner/host/child_process_base.cc
index d01aa235d8c10fb1512a4fa933005dee0b4d8637..d263a03e8287f63704ccbaf3bbb227396961033e 100644
--- a/services/shell/runner/host/child_process_base.cc
+++ b/services/shell/runner/host/child_process_base.cc
@@ -18,7 +18,7 @@
#include "services/shell/runner/common/client_util.h"
#include "services/shell/runner/common/switches.h"
-#if defined(OS_LINUX) && !defined(OS_ANDROID)
+#if defined(OS_LINUX)
#include "base/rand_util.h"
#include "base/sys_info.h"
#include "services/shell/runner/host/linux_sandbox.h"
@@ -32,7 +32,7 @@ namespace shell {
namespace {
-#if defined(OS_LINUX) && !defined(OS_ANDROID)
+#if defined(OS_LINUX)
std::unique_ptr<LinuxSandbox> InitializeSandbox() {
using sandbox::syscall_broker::BrokerFilePermission;
// Warm parts of base in the copy of base in the mojo runner.
@@ -113,7 +113,7 @@ void ChildProcessMainWithCallback(const RunCallback& callback) {
// sure symbol names in all loaded libraries will be cached.
base::debug::EnableInProcessStackDumping();
#endif
-#if defined(OS_LINUX) && !defined(OS_ANDROID)
+#if defined(OS_LINUX)
std::unique_ptr<LinuxSandbox> sandbox;
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
« no previous file with comments | « no previous file | services/shell/runner/host/child_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698