Remove EnableZygote API.

content/browser/utility_process_host_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/utility_process_host_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 60 matching lines @@
     : client_(client),
       client_task_runner_(client_task_runner),
       is_batch_mode_(false),
       is_mdns_enabled_(false),
       no_sandbox_(false),
 #if defined(OS_LINUX)
       child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
 #else
       child_flags_(ChildProcessHost::CHILD_NORMAL),
 #endif
-      use_linux_zygote_(false),
       started_(false) {
 }
 
 UtilityProcessHostImpl::~UtilityProcessHostImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (is_batch_mode_)
     EndBatchMode();
 }
 
 bool UtilityProcessHostImpl::Send(IPC::Message* message) {
@@ skipping 21 matching lines @@
 }
 
 void UtilityProcessHostImpl::EnableMDns() {
   is_mdns_enabled_ = true;
 }
 
 void UtilityProcessHostImpl::DisableSandbox() {
   no_sandbox_ = true;
 }
 
-void UtilityProcessHostImpl::EnableZygote() {
-  use_linux_zygote_ = true;
-}
-
 const ChildProcessData& UtilityProcessHostImpl::GetData() {
   return process_->GetData();
 }
 
 #if defined(OS_POSIX)
 
 void UtilityProcessHostImpl::SetEnv(const base::EnvironmentMap& env) {
   env_ = env;
 }
 
@@ skipping 56 matching lines @@
     if (no_sandbox_ || browser_command_line.HasSwitch(switches::kNoSandbox))
       cmd_line->AppendSwitch(switches::kNoSandbox);
 #if defined(OS_MACOSX)
     if (browser_command_line.HasSwitch(switches::kEnableSandboxLogging))
       cmd_line->AppendSwitch(switches::kEnableSandboxLogging);
 #endif
     if (browser_command_line.HasSwitch(switches::kDebugPluginLoading))
       cmd_line->AppendSwitch(switches::kDebugPluginLoading);
 
 #if defined(OS_POSIX)
-    // TODO(port): Sandbox this on Linux.  Also, zygote this to work with
-    // Linux updating.
     if (has_cmd_prefix) {
-      // launch the utility child process with some prefix
+      // Launch the utility child process with some prefix
       // (usually "xterm -e gdb --args").
       cmd_line->PrependWrapper(browser_command_line.GetSwitchValueNative(
           switches::kUtilityCmdPrefix));
     }
 
-    cmd_line->AppendSwitchPath(switches::kUtilityProcessAllowedDir,
-                               exposed_dir_);
+    if (!exposed_dir_.empty()) {
+      cmd_line->AppendSwitchPath(switches::kUtilityProcessAllowedDir,
+                                 exposed_dir_);
+    }
 #endif
 
     if (is_mdns_enabled_)
       cmd_line->AppendSwitch(switches::kUtilityProcessEnableMDns);
 
     bool use_zygote = false;
 
 #if defined(OS_LINUX)
-    use_zygote = !no_sandbox_ && use_linux_zygote_;
+    // The Linux sandbox does not support granting access to a single directory,
+    // so we need to bypass the zygote in that case.
+    use_zygote = !no_sandbox_ && exposed_dir_.empty();
 #endif
 
     process_->Launch(
 #if defined(OS_WIN)
         new UtilitySandboxedProcessLauncherDelegate(exposed_dir_),
 #elif defined(OS_POSIX)
         use_zygote,
         env_,
 #endif
         cmd_line);
@@ skipping 12 matching lines @@
 }
 
 void UtilityProcessHostImpl::OnProcessCrashed(int exit_code) {
   client_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&UtilityProcessHostClient::OnProcessCrashed, client_.get(),
             exit_code));
 }
 
 }  // namespace content