Remove SandboxIPCProcess's dependency on chrome-sandbox

content/browser/renderer_host/sandbox_ipc_linux.cc

Index: content/browser/renderer_host/sandbox_ipc_linux.cc
diff --git a/content/browser/renderer_host/sandbox_ipc_linux.cc b/content/browser/renderer_host/sandbox_ipc_linux.cc
index f988ae942dc0b16cfdff1a6ad85a22f33750ce7f..f156e30b60584cf77ccfb27a1464727614b2df16 100644
--- a/content/browser/renderer_host/sandbox_ipc_linux.cc
+++ b/content/browser/renderer_host/sandbox_ipc_linux.cc
@@ -129,15 +129,8 @@ static void MSCharSetToFontconfig(FcLangSet* langset, unsigned fdwCharSet) {
 
 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(
@@ -220,8 +213,6 @@ void SandboxIPCProcess::HandleRequestFromRenderer(int fd) {
     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) {
@@ -403,41 +394,6 @@ void SandboxIPCProcess::HandleLocaltime(
   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,