Enable sandbox in local discovery utility process.

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 93 matching lines @@
     base::SequencedTaskRunner* client_task_runner) {
   return new UtilityProcessHostImpl(client, client_task_runner);
 }
 
 UtilityProcessHostImpl::UtilityProcessHostImpl(
     UtilityProcessHostClient* client,
     base::SequencedTaskRunner* client_task_runner)
     : 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));
-  DCHECK(!is_batch_mode_);
+  if (is_batch_mode_)
+    EndBatchMode();
 }
 
 bool UtilityProcessHostImpl::Send(IPC::Message* message) {
   if (!StartProcess())
     return false;
 
   return process_->Send(message);
 }
 
 bool UtilityProcessHostImpl::StartBatchMode()  {
   CHECK(!is_batch_mode_);
   is_batch_mode_ = StartProcess();
   Send(new UtilityMsg_BatchMode_Started());
   return is_batch_mode_;
 }
 
 void UtilityProcessHostImpl::EndBatchMode()  {
   CHECK(is_batch_mode_);
   is_batch_mode_ = false;
   Send(new UtilityMsg_BatchMode_Finished());
 }
 
 void UtilityProcessHostImpl::SetExposedDir(const base::FilePath& dir) {
   exposed_dir_ = dir;
 }
 
+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();
@@ skipping 74 matching lines @@
     if (has_cmd_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_);
 #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_;
 #endif
 
     process_->Launch(
 #if defined(OS_WIN)
         new UtilitySandboxedProcessLauncherDelegate(exposed_dir_),
 #elif defined(OS_POSIX)
@@ skipping 16 matching lines @@
 }
 
 void UtilityProcessHostImpl::OnProcessCrashed(int exit_code) {
   client_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&UtilityProcessHostClient::OnProcessCrashed, client_.get(),
             exit_code));
 }
 
 }  // namespace content