Remove SandboxIPCProcess's dependency on chrome-sandbox

content/browser/renderer_host/sandbox_ipc_linux.cc

 // Copyright 2014 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/renderer_host/sandbox_ipc_linux.h"
 
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <sys/poll.h>
 #include <sys/socket.h>
@@ skipping 111 matching lines @@
       // default:
       // Don't add any languages in that case that we don't recognise the
       // constant.
   }
 }
 
 }  // namespace
 
 namespace content {
 
-SandboxIPCProcess::SandboxIPCProcess(int lifeline_fd,
-                                     int browser_socket,
-                                     std::string sandbox_cmd)
+SandboxIPCProcess::SandboxIPCProcess(int lifeline_fd, int browser_socket)
     : lifeline_fd_(lifeline_fd), browser_socket_(browser_socket) {
-  if (!sandbox_cmd.empty()) {
-    sandbox_cmd_.push_back(sandbox_cmd);
-    sandbox_cmd_.push_back(base::kFindInodeSwitch);
-  }
-
   // FontConfig doesn't provide a standard property to control subpixel
   // positioning, so we pass the current setting through to WebKit.
   WebFontInfo::setSubpixelPositioning(
       gfx::GetDefaultWebkitSubpixelPositioning());
 
   CommandLine& command_line = *CommandLine::ForCurrentProcess();
   command_line.AppendSwitchASCII(switches::kProcessType,
                                  switches::kSandboxIPCProcess);
 
   // Update the process title. The argv was already cached by the call to
@@ skipping 62 matching lines @@
     return;
 
   if (kind == FontConfigIPC::METHOD_MATCH) {
     HandleFontMatchRequest(fd, pickle, iter, fds.get());
   } else if (kind == FontConfigIPC::METHOD_OPEN) {
     HandleFontOpenRequest(fd, pickle, iter, fds.get());
   } else if (kind == LinuxSandbox::METHOD_GET_FONT_FAMILY_FOR_CHAR) {
     HandleGetFontFamilyForChar(fd, pickle, iter, fds.get());
   } else if (kind == LinuxSandbox::METHOD_LOCALTIME) {
     HandleLocaltime(fd, pickle, iter, fds.get());
-  } else if (kind == LinuxSandbox::METHOD_GET_CHILD_WITH_INODE) {
-    HandleGetChildWithInode(fd, pickle, iter, fds.get());
   } else if (kind == LinuxSandbox::METHOD_GET_STYLE_FOR_STRIKE) {
     HandleGetStyleForStrike(fd, pickle, iter, fds.get());
   } else if (kind == LinuxSandbox::METHOD_MAKE_SHARED_MEMORY_SEGMENT) {
     HandleMakeSharedMemorySegment(fd, pickle, iter, fds.get());
   } else if (kind == LinuxSandbox::METHOD_MATCH_WITH_FALLBACK) {
     HandleMatchWithFallback(fd, pickle, iter, fds.get());
   }
 }
 
 int SandboxIPCProcess::FindOrAddPath(const SkString& path) {
@@ skipping 161 matching lines @@
                                 sizeof(struct tm));
     time_zone_string = expanded_time->tm_zone;
   }
 
   Pickle reply;
   reply.WriteString(result_string);
   reply.WriteString(time_zone_string);
   SendRendererReply(fds, reply, -1);
 }
 
-void SandboxIPCProcess::HandleGetChildWithInode(
-    int fd,
-    const Pickle& pickle,
-    PickleIterator iter,
-    const std::vector<base::ScopedFD*>& fds) {
-  // The other side of this call is in zygote_main_linux.cc
-  if (sandbox_cmd_.empty()) {
-    LOG(ERROR) << "Not in the sandbox, this should not be called";
-    return;
-  }
-
-  uint64_t inode;
-  if (!pickle.ReadUInt64(&iter, &inode))
-    return;
-
-  base::ProcessId pid = 0;
-  std::string inode_output;
-
-  std::vector<std::string> sandbox_cmd = sandbox_cmd_;
-  sandbox_cmd.push_back(base::Int64ToString(inode));
-  CommandLine get_inode_cmd(sandbox_cmd);
-  if (base::GetAppOutput(get_inode_cmd, &inode_output))
-    base::StringToInt(inode_output, &pid);
-
-  if (!pid) {
-    // Even though the pid is invalid, we still need to reply to the zygote
-    // and not just return here.
-    LOG(ERROR) << "Could not get pid";
-  }
-
-  Pickle reply;
-  reply.WriteInt(pid);
-  SendRendererReply(fds, reply, -1);
-}
-
 void SandboxIPCProcess::HandleMakeSharedMemorySegment(
     int fd,
     const Pickle& pickle,
     PickleIterator iter,
     const std::vector<base::ScopedFD*>& fds) {
   base::SharedMemoryCreateOptions options;
   uint32_t size;
   if (!pickle.ReadUInt32(&iter, &size))
     return;
   options.size = size;
@@ skipping 210 matching lines @@
 }
 
 void SandboxIPCProcess::EnsureWebKitInitialized() {
   if (webkit_platform_support_)
     return;
   webkit_platform_support_.reset(new BlinkPlatformImpl);
   blink::initializeWithoutV8(webkit_platform_support_.get());
 }
 
 }  // namespace content