From 052407d3f4a22a99a6160053bac56184473bee35 Mon Sep 17 00:00:00 2001
From: SiliFuzz Team <noreply@google.com>
Date: Fri, 13 Sep 2024 20:59:47 -0700
Subject: [PATCH] No public description

PiperOrigin-RevId: 674533854
---
 snap/BUILD                    | 8 +++++---
 snap/snap_corpus_util.h       | 1 +
 snap/snap_corpus_util_test.cc | 4 ++--
 snap/snap_relocator_test.cc   | 4 +++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/snap/BUILD b/snap/BUILD
index 13003f17..4677bf4b 100644
--- a/snap/BUILD
+++ b/snap/BUILD
@@ -84,10 +84,12 @@ cc_test(
         ":snap",
         ":snap_relocator",
         "@silifuzz//common:snapshot",
+        "@silifuzz//common:snapshot_test_enum",
         "@silifuzz//snap/gen:relocatable_snap_generator",
         "@silifuzz//snap/gen:snap_generator",
         "@silifuzz//snap/testing:snap_test_snapshots",
-        "@silifuzz//snap/testing:snap_test_types",
+        "@silifuzz//util:arch",
+        "@silifuzz//util:checks",
         "@silifuzz//util:mmapped_memory_ptr",
         "@silifuzz//util/testing:status_macros",
         "@com_google_absl//absl/status:statusor",
@@ -181,15 +183,15 @@ cc_test(
     deps = [
         ":snap_corpus_util",
         "@silifuzz//common:snapshot",
+        "@silifuzz//common:snapshot_test_enum",
         "@silifuzz//snap/gen:relocatable_snap_generator",
         "@silifuzz//snap/gen:snap_generator",
         "@silifuzz//snap/testing:snap_test_snapshots",
-        "@silifuzz//snap/testing:snap_test_types",
+        "@silifuzz//util:arch",
         "@silifuzz//util:file_util",
         "@silifuzz//util:mmapped_memory_ptr",
         "@silifuzz//util:path_util",
         "@silifuzz//util/testing:status_macros",
-        "@silifuzz//util/testing:status_matchers",
         "@com_google_absl//absl/status:statusor",
         "@com_google_googletest//:gtest_main",
     ],
diff --git a/snap/snap_corpus_util.h b/snap/snap_corpus_util.h
index 206e9956..bfb57feb 100644
--- a/snap/snap_corpus_util.h
+++ b/snap/snap_corpus_util.h
@@ -16,6 +16,7 @@
 #define THIRD_PARTY_SILIFUZZ_SNAP_SNAP_CORPUS_UTIL_H_
 
 #include "./snap/snap.h"
+#include "./util/arch.h"
 #include "./util/mmapped_memory_ptr.h"
 
 // Library for handling relocatable snap corpus.
diff --git a/snap/snap_corpus_util_test.cc b/snap/snap_corpus_util_test.cc
index fcde9ef6..a86e5042 100644
--- a/snap/snap_corpus_util_test.cc
+++ b/snap/snap_corpus_util_test.cc
@@ -22,15 +22,15 @@
 #include "gtest/gtest.h"
 #include "absl/status/statusor.h"
 #include "./common/snapshot.h"
+#include "./common/snapshot_test_enum.h"
 #include "./snap/gen/relocatable_snap_generator.h"
 #include "./snap/gen/snap_generator.h"
 #include "./snap/testing/snap_test_snapshots.h"
-#include "./snap/testing/snap_test_types.h"
+#include "./util/arch.h"
 #include "./util/file_util.h"
 #include "./util/mmapped_memory_ptr.h"
 #include "./util/path_util.h"
 #include "./util/testing/status_macros.h"
-#include "./util/testing/status_matchers.h"
 
 namespace silifuzz {
 namespace {
diff --git a/snap/snap_relocator_test.cc b/snap/snap_relocator_test.cc
index 0b1b3818..c696e0f2 100644
--- a/snap/snap_relocator_test.cc
+++ b/snap/snap_relocator_test.cc
@@ -23,11 +23,13 @@
 #include "gtest/gtest.h"
 #include "absl/status/statusor.h"
 #include "./common/snapshot.h"
+#include "./common/snapshot_test_enum.h"
 #include "./snap/gen/relocatable_snap_generator.h"
 #include "./snap/gen/snap_generator.h"
 #include "./snap/snap.h"
 #include "./snap/testing/snap_test_snapshots.h"
-#include "./snap/testing/snap_test_types.h"
+#include "./util/arch.h"
+#include "./util/checks.h"
 #include "./util/mmapped_memory_ptr.h"
 #include "./util/testing/status_macros.h"