commit 96ee6f6aa4c99e0c8a4748ddb95bcf5c5dad4064
author Hugo Benichi <hugobenichi@google.com> Mon Jun 28 14:07:20 2021 +0900
committer Commit Bot <commit-bot@chromium.org> Sat Jul 10 00:38:17 2021 +0000
tree 195c2c1be1b76bec6aa3193b83d530743c0db4bb
parent 153c711e3cc1436980efa481ba9c1b7c1812ac68

patchpanel: use System in MinijailedProcessRunner

Also makes unit tests of MinijailedProcessRunner more strictly asserts
arguments and expected calls.

BUG=b:178980566
TEST=Unit tests. Compiled, flashed trogdor, booted, started user
session, checked iptables setup and ARC setup.

Change-Id: I28e365f23cb45f9a2285c77c3d7e7feecdba5f63
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2991802
Tested-by: Hugo Benichi <hugobenichi@google.com>
Commit-Queue: Hugo Benichi <hugobenichi@google.com>
Reviewed-by: Garrick Evans <garrick@chromium.org>

patchpanel/system.cc

diff --git a/patchpanel/system.cc b/patchpanel/system.cc
index b971206..f91f9f7 100644
--- a/patchpanel/system.cc
+++ b/patchpanel/system.cc
@@ -6,7 +6,7 @@
 
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
 #include <base/files/scoped_file.h>
@@ -57,6 +57,10 @@
   return Ioctl(fd, request, reinterpret_cast<const char*>(route));
 }
 
+pid_t System::WaitPid(pid_t pid, int* wstatus, int options) {
+  return waitpid(pid, wstatus, options);
+}
+
 bool System::SysNetSet(SysNet target,
                        const std::string& content,
                        const std::string& iface) {