From 1c833d6f25ae4763eb1e4fb4401f25d2bdc6ef40 Mon Sep 17 00:00:00 2001
From: Sandboxed API Team <sandboxed-api@google.com>
Date: Mon, 31 Aug 2020 08:13:00 -0700
Subject: [PATCH] Internal cleanup migrating StatusOr.

PiperOrigin-RevId: 329304527
Change-Id: Id6c141272df54c4e165829d690f9f5b2e9ee90cc
---
 sandboxed_api/sandbox2/BUILD.bazel               | 1 +
 sandboxed_api/sandbox2/buffer.cc                 | 1 +
 sandboxed_api/sandbox2/network_proxy/BUILD.bazel | 1 +
 sandboxed_api/sandbox2/network_proxy/server.cc   | 1 +
 sandboxed_api/sandbox2/policybuilder.cc          | 2 ++
 sandboxed_api/sandbox2/policybuilder_test.cc     | 1 +
 sandboxed_api/sandbox2/sandbox2.cc               | 1 +
 sandboxed_api/sandbox2/util/maps_parser.cc       | 1 +
 sandboxed_api/sandbox2/util/temp_file.cc         | 1 +
 9 files changed, 10 insertions(+)

diff --git a/sandboxed_api/sandbox2/BUILD.bazel b/sandboxed_api/sandbox2/BUILD.bazel
index 09dbab4..ad415c2 100644
--- a/sandboxed_api/sandbox2/BUILD.bazel
+++ b/sandboxed_api/sandbox2/BUILD.bazel
@@ -803,6 +803,7 @@ cc_test(
         ":testing",
         "//sandboxed_api/sandbox2/util:bpf_helper",
         "//sandboxed_api/util:status_matchers",
+        "//sandboxed_api/util:statusor",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
diff --git a/sandboxed_api/sandbox2/buffer.cc b/sandboxed_api/sandbox2/buffer.cc
index ea5f808..9c39339 100644
--- a/sandboxed_api/sandbox2/buffer.cc
+++ b/sandboxed_api/sandbox2/buffer.cc
@@ -21,6 +21,7 @@
 #include <cerrno>
 
 #include "absl/memory/memory.h"
+#include "sandboxed_api/util/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "sandboxed_api/sandbox2/util.h"
 #include "sandboxed_api/sandbox2/util/strerror.h"
diff --git a/sandboxed_api/sandbox2/network_proxy/BUILD.bazel b/sandboxed_api/sandbox2/network_proxy/BUILD.bazel
index 5935390..d489a53 100644
--- a/sandboxed_api/sandbox2/network_proxy/BUILD.bazel
+++ b/sandboxed_api/sandbox2/network_proxy/BUILD.bazel
@@ -29,6 +29,7 @@ cc_library(
         ":filtering",
         "//sandboxed_api/sandbox2:comms",
         "//sandboxed_api/sandbox2/util:fileops",
+        "//sandboxed_api/util:statusor",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/strings",
         "@com_google_glog//:glog",
diff --git a/sandboxed_api/sandbox2/network_proxy/server.cc b/sandboxed_api/sandbox2/network_proxy/server.cc
index c183812..41f6f7e 100644
--- a/sandboxed_api/sandbox2/network_proxy/server.cc
+++ b/sandboxed_api/sandbox2/network_proxy/server.cc
@@ -26,6 +26,7 @@
 
 #include <glog/logging.h>
 #include "absl/memory/memory.h"
+#include "sandboxed_api/util/statusor.h"
 #include "sandboxed_api/sandbox2/util/fileops.h"
 
 namespace sandbox2 {
diff --git a/sandboxed_api/sandbox2/policybuilder.cc b/sandboxed_api/sandbox2/policybuilder.cc
index 9eec379..d185631 100644
--- a/sandboxed_api/sandbox2/policybuilder.cc
+++ b/sandboxed_api/sandbox2/policybuilder.cc
@@ -15,6 +15,7 @@
 #include "sandboxed_api/sandbox2/policybuilder.h"
 
 #include <asm/ioctls.h>  // For TCGETS
+
 #if defined(__x86_64__)
 #include <asm/prctl.h>
 #endif
@@ -34,6 +35,7 @@
 #include <utility>
 
 #include "absl/memory/memory.h"
+#include "sandboxed_api/util/statusor.h"
 #include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
 #include "sandboxed_api/sandbox2/namespace.h"
diff --git a/sandboxed_api/sandbox2/policybuilder_test.cc b/sandboxed_api/sandbox2/policybuilder_test.cc
index a86befd..ca13614 100644
--- a/sandboxed_api/sandbox2/policybuilder_test.cc
+++ b/sandboxed_api/sandbox2/policybuilder_test.cc
@@ -24,6 +24,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "absl/memory/memory.h"
+#include "sandboxed_api/util/statusor.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
diff --git a/sandboxed_api/sandbox2/sandbox2.cc b/sandboxed_api/sandbox2/sandbox2.cc
index 559bceb..86c06dc 100644
--- a/sandboxed_api/sandbox2/sandbox2.cc
+++ b/sandboxed_api/sandbox2/sandbox2.cc
@@ -21,6 +21,7 @@
 #include <string>
 
 #include "absl/memory/memory.h"
+#include "sandboxed_api/util/statusor.h"
 #include "absl/time/time.h"
 #include "sandboxed_api/sandbox2/monitor.h"
 #include "sandboxed_api/sandbox2/result.h"
diff --git a/sandboxed_api/sandbox2/util/maps_parser.cc b/sandboxed_api/sandbox2/util/maps_parser.cc
index d3040cc..cf0955f 100644
--- a/sandboxed_api/sandbox2/util/maps_parser.cc
+++ b/sandboxed_api/sandbox2/util/maps_parser.cc
@@ -15,6 +15,7 @@
 #include "sandboxed_api/sandbox2/util/maps_parser.h"
 
 #include "absl/status/status.h"
+#include "sandboxed_api/util/statusor.h"
 #include "absl/strings/str_split.h"
 
 namespace sandbox2 {
diff --git a/sandboxed_api/sandbox2/util/temp_file.cc b/sandboxed_api/sandbox2/util/temp_file.cc
index 9caac66..602a18c 100644
--- a/sandboxed_api/sandbox2/util/temp_file.cc
+++ b/sandboxed_api/sandbox2/util/temp_file.cc
@@ -22,6 +22,7 @@
 #include <cstdlib>
 #include <vector>
 
+#include "sandboxed_api/util/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "sandboxed_api/sandbox2/util/fileops.h"
 #include "sandboxed_api/sandbox2/util/strerror.h"