Add an API around zygoteHost so that chrome doesn't reach into the internal content implementation.

content/browser/zygote_host_impl_linux.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/zygote_host_linux.h"
+#include "content/browser/zygote_host_impl_linux.h"
 
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/eintr_wrapper.h"
 #include "base/environment.h"
@@ skipping 35 matching lines @@
     std::string value;
     if (env->GetVar(envvar, &value))
       env->SetVar(saved_envvar, value);
     else
       env->UnSetVar(saved_envvar);
 
     free(saved_envvar);
   }
 }
 
-ZygoteHost::ZygoteHost()
+// static
+content::ZygoteHost* content::ZygoteHost::GetInstance() {
+  return ZygoteHostImpl::GetInstance();
+}
+
+ZygoteHostImpl::ZygoteHostImpl()
     : control_fd_(-1),
       pid_(-1),
       init_(false),
       using_suid_sandbox_(false),
       have_read_sandbox_status_word_(false),
       sandbox_status_(0) {}
 
-ZygoteHost::~ZygoteHost() {
+ZygoteHostImpl::~ZygoteHostImpl() {
   if (init_)
     close(control_fd_);
 }
 
 // static
-ZygoteHost* ZygoteHost::GetInstance() {
-  return Singleton<ZygoteHost>::get();
+ZygoteHostImpl* ZygoteHostImpl::GetInstance() {
+  return Singleton<ZygoteHostImpl>::get();
 }
 
-void ZygoteHost::Init(const std::string& sandbox_cmd) {
+void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
   DCHECK(!init_);
   init_ = true;
 
   FilePath chrome_path;
   CHECK(PathService::Get(base::FILE_EXE, &chrome_path));
   CommandLine cmd_line(chrome_path);
 
   cmd_line.AppendSwitchASCII(switches::kProcessType, switches::kZygoteProcess);
 
   int fds[2];
@@ skipping 124 matching lines @@
 
   Pickle pickle;
   pickle.WriteInt(kCmdGetSandboxStatus);
   std::vector<int> empty_fds;
   if (!UnixDomainSocket::SendMsg(control_fd_, pickle.data(), pickle.size(),
                                  empty_fds))
     LOG(FATAL) << "Cannot communicate with zygote";
   // We don't wait for the reply. We'll read it in ReadReply.
 }
 
-ssize_t ZygoteHost::ReadReply(void* buf, size_t buf_len) {
+ssize_t ZygoteHostImpl::ReadReply(void* buf, size_t buf_len) {
   // At startup we send a kCmdGetSandboxStatus request to the zygote, but don't
   // wait for the reply. Thus, the first time that we read from the zygote, we
   // get the reply to that request.
   if (!have_read_sandbox_status_word_) {
     if (HANDLE_EINTR(read(control_fd_, &sandbox_status_,
                           sizeof(sandbox_status_))) !=
         sizeof(sandbox_status_)) {
       return -1;
     }
     have_read_sandbox_status_word_ = true;
   }
 
   return HANDLE_EINTR(read(control_fd_, buf, buf_len));
 }
 
-pid_t ZygoteHost::ForkRequest(
+pid_t ZygoteHostImpl::ForkRequest(
     const std::vector<std::string>& argv,
     const base::GlobalDescriptors::Mapping& mapping,
     const std::string& process_type) {
   DCHECK(init_);
   Pickle pickle;
 
   pickle.WriteInt(kCmdFork);
   pickle.WriteString(process_type);
   pickle.WriteInt(argv.size());
   for (std::vector<std::string>::const_iterator
@@ skipping 61 matching lines @@
   // chrome::kLowestRendererOomScore in chrome/chrome_constants.h, but
   // that's not something we can include here.)
   const int kLowestRendererOomScore = 300;
   AdjustRendererOOMScore(pid, kLowestRendererOomScore);
 #endif
 
   return pid;
 }
 
 #if !defined(OS_OPENBSD)
-void ZygoteHost::AdjustRendererOOMScore(base::ProcessHandle pid, int score) {
+void ZygoteHostImpl::AdjustRendererOOMScore(base::ProcessHandle pid,
+                                            int score) {
   // 1) You can't change the oom_score_adj of a non-dumpable process
   //    (EPERM) unless you're root. Because of this, we can't set the
   //    oom_adj from the browser process.
   //
   // 2) We can't set the oom_score_adj before entering the sandbox
   //    because the zygote is in the sandbox and the zygote is as
   //    critical as the browser process. Its oom_adj value shouldn't
   //    be changed.
   //
   // 3) A non-dumpable process can't even change its own oom_score_adj
@@ skipping 47 matching lines @@
                             &sandbox_helper_process)) {
       base::EnsureProcessGetsReaped(sandbox_helper_process);
     }
   } else if (!using_suid_sandbox_) {
     if (!base::AdjustOOMScore(pid, score))
       PLOG(ERROR) << "Failed to adjust OOM score of renderer with pid " << pid;
   }
 }
 #endif
 
-void ZygoteHost::EnsureProcessTerminated(pid_t process) {
+void ZygoteHostImpl::EnsureProcessTerminated(pid_t process) {
   DCHECK(init_);
   Pickle pickle;
 
   pickle.WriteInt(kCmdReap);
   pickle.WriteInt(process);
 
   if (HANDLE_EINTR(write(control_fd_, pickle.data(), pickle.size())) < 0)
     PLOG(ERROR) << "write";
 }
 
-base::TerminationStatus ZygoteHost::GetTerminationStatus(
+base::TerminationStatus ZygoteHostImpl::GetTerminationStatus(
     base::ProcessHandle handle,
     int* exit_code) {
   DCHECK(init_);
   Pickle pickle;
   pickle.WriteInt(kCmdGetTerminationStatus);
   pickle.WriteInt(handle);
 
   // Set this now to handle the early termination cases.
   if (exit_code)
     *exit_code = content::RESULT_CODE_NORMAL_EXIT;
@@ skipping 24 matching lines @@
       !read_pickle.ReadInt(&iter, &tmp_exit_code)) {
     LOG(WARNING) << "Error parsing GetTerminationStatus response from zygote.";
     return base::TERMINATION_STATUS_NORMAL_TERMINATION;
   }
 
   if (exit_code)
     *exit_code = tmp_exit_code;
 
   return static_cast<base::TerminationStatus>(status);
 }
+
+pid_t ZygoteHostImpl::GetPid() const {
+  return pid_;
+}
+
+int ZygoteHostImpl::GetSandboxStatus() const {
+  if (have_read_sandbox_status_word_)
+    return sandbox_status_;
+  return 0;
+}