switch to using android-base/file.h instead of android-base/test_utils.h

Test: compile
Bug: 119313545
Change-Id: I664fb32522d01909c603d7b903475c4e9aea9223

27 files changed, 9 insertions, 27 deletions

diff --git a/libperfmgr/tests/FileNodeTest.cc b/libperfmgr/tests/FileNodeTest.cc
index 4c14aadc..04d7345b 100644
--- a/libperfmgr/tests/FileNodeTest.cc
+++ b/libperfmgr/tests/FileNodeTest.cc
@@ -19,7 +19,6 @@
 
 #include <android-base/file.h>
 #include <android-base/stringprintf.h>
-#include <android-base/test_utils.h>
 
 #include <gtest/gtest.h>
 
diff --git a/libperfmgr/tests/HintManagerTest.cc b/libperfmgr/tests/HintManagerTest.cc
index 09fd8a0f..434a3cca 100644
--- a/libperfmgr/tests/HintManagerTest.cc
+++ b/libperfmgr/tests/HintManagerTest.cc
@@ -20,7 +20,6 @@
 #include <android-base/file.h>
 #include <android-base/logging.h>
 #include <android-base/properties.h>
-#include <android-base/test_utils.h>
 
 #include <gtest/gtest.h>
 
diff --git a/libperfmgr/tests/NodeLooperThreadTest.cc b/libperfmgr/tests/NodeLooperThreadTest.cc
index 9f36f896..fd634d89 100644
--- a/libperfmgr/tests/NodeLooperThreadTest.cc
+++ b/libperfmgr/tests/NodeLooperThreadTest.cc
@@ -18,7 +18,6 @@
 #include <thread>
 
 #include <android-base/file.h>
-#include <android-base/test_utils.h>
 
 #include <gtest/gtest.h>
 
diff --git a/libperfmgr/tests/PropertyNodeTest.cc b/libperfmgr/tests/PropertyNodeTest.cc
index 6313d110..f0aa6b27 100644
--- a/libperfmgr/tests/PropertyNodeTest.cc
+++ b/libperfmgr/tests/PropertyNodeTest.cc
@@ -20,7 +20,6 @@
 #include <android-base/file.h>
 #include <android-base/properties.h>
 #include <android-base/stringprintf.h>
-#include <android-base/test_utils.h>
 
 #include <gtest/gtest.h>
 
diff --git a/memory_replay/tests/LineBufferTest.cpp b/memory_replay/tests/LineBufferTest.cpp
index 29d1b53b..1a310226 100644
--- a/memory_replay/tests/LineBufferTest.cpp
+++ b/memory_replay/tests/LineBufferTest.cpp
@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include <android-base/test_utils.h>
+#include <android-base/file.h>
 
 #include "LineBuffer.h"
 
diff --git a/memory_replay/tests/NativeInfoTest.cpp b/memory_replay/tests/NativeInfoTest.cpp
index 59dbbd98..e0dea509 100644
--- a/memory_replay/tests/NativeInfoTest.cpp
+++ b/memory_replay/tests/NativeInfoTest.cpp
@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include <android-base/test_utils.h>
+#include <android-base/file.h>
 
 #include "NativeInfo.h"
 
diff --git a/perfprofd/tests/perfprofd_test.cc b/perfprofd/tests/perfprofd_test.cc
index bbb9a739..311ab6a0 100644
--- a/perfprofd/tests/perfprofd_test.cc
+++ b/perfprofd/tests/perfprofd_test.cc
@@ -35,7 +35,6 @@
 #include <android-base/macros.h>
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
-#include <android-base/test_utils.h>
 #include <android-base/thread_annotations.h>
 #include <gtest/gtest.h>
 #include <zlib.h>
diff --git a/simpleperf/JITDebugReader.h b/simpleperf/JITDebugReader.h
index 73566f6b..15d03a02 100644
--- a/simpleperf/JITDebugReader.h
+++ b/simpleperf/JITDebugReader.h
@@ -27,8 +27,8 @@
 #include <unordered_set>
 #include <vector>
 
+#include <android-base/file.h>
 #include <android-base/logging.h>
-#include <android-base/test_utils.h>
 
 #include "IOEventLoop.h"
 #include "record.h"
diff --git a/simpleperf/cmd_debug_unwind_test.cpp b/simpleperf/cmd_debug_unwind_test.cpp
index 3eddb38d..e6b68670 100644
--- a/simpleperf/cmd_debug_unwind_test.cpp
+++ b/simpleperf/cmd_debug_unwind_test.cpp
@@ -23,7 +23,6 @@
 #include <vector>
 
 #include <android-base/file.h>
-#include <android-base/test_utils.h>
 
 #include "command.h"
 #include "get_test_data.h"
diff --git a/simpleperf/cmd_kmem_test.cpp b/simpleperf/cmd_kmem_test.cpp
index 3bc44733..4dab87ed 100644
--- a/simpleperf/cmd_kmem_test.cpp
+++ b/simpleperf/cmd_kmem_test.cpp
@@ -18,7 +18,6 @@
 
 #include <android-base/file.h>
 #include <android-base/strings.h>
-#include <android-base/test_utils.h>
 
 #include <memory>
 
diff --git a/simpleperf/cmd_list.cpp b/simpleperf/cmd_list.cpp
index dd73b9df..c87c05f5 100644
--- a/simpleperf/cmd_list.cpp
+++ b/simpleperf/cmd_list.cpp
@@ -19,8 +19,8 @@
 #include <string>
 #include <vector>
 
+#include <android-base/file.h>
 #include <android-base/logging.h>
-#include <android-base/test_utils.h>
 
 #include "command.h"
 #include "environment.h"
diff --git a/simpleperf/cmd_record.cpp b/simpleperf/cmd_record.cpp
index db21d4cb..82b734c0 100644
--- a/simpleperf/cmd_record.cpp
+++ b/simpleperf/cmd_record.cpp
@@ -32,7 +32,6 @@
 #include <android-base/file.h>
 #include <android-base/parseint.h>
 #include <android-base/strings.h>
-#include <android-base/test_utils.h>
 #if defined(__ANDROID__)
 #include <android-base/properties.h>
 #endif
diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp
index 0c0feae4..0eed0d68 100644
--- a/simpleperf/cmd_record_test.cpp
+++ b/simpleperf/cmd_record_test.cpp
@@ -22,10 +22,10 @@
 
 #include <android-base/file.h>
 #include <android-base/stringprintf.h>
-#include <android-base/test_utils.h>
 
 #include <map>
 #include <memory>
+#include <regex>
 #include <thread>
 
 #include "command.h"
diff --git a/simpleperf/cmd_report_sample_test.cpp b/simpleperf/cmd_report_sample_test.cpp
index a393713b..34ba3f72 100644
--- a/simpleperf/cmd_report_sample_test.cpp
+++ b/simpleperf/cmd_report_sample_test.cpp
@@ -17,7 +17,6 @@
 #include <gtest/gtest.h>
 
 #include <android-base/file.h>
-#include <android-base/test_utils.h>
 
 #include "command.h"
 #include "get_test_data.h"
diff --git a/simpleperf/cmd_report_test.cpp b/simpleperf/cmd_report_test.cpp
index a7670300..e112d0d0 100644
--- a/simpleperf/cmd_report_test.cpp
+++ b/simpleperf/cmd_report_test.cpp
@@ -21,7 +21,6 @@
 
 #include <android-base/file.h>
 #include <android-base/strings.h>
-#include <android-base/test_utils.h>
 
 #include "command.h"
 #include "get_test_data.h"
diff --git a/simpleperf/cmd_stat_test.cpp b/simpleperf/cmd_stat_test.cpp
index 1e4596fa..9dbc6590 100644
--- a/simpleperf/cmd_stat_test.cpp
+++ b/simpleperf/cmd_stat_test.cpp
@@ -19,7 +19,6 @@
 #include <android-base/file.h>
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
-#include <android-base/test_utils.h>
 
 #include <thread>
 
diff --git a/simpleperf/cmd_trace_sched.cpp b/simpleperf/cmd_trace_sched.cpp
index 6d61d9ec..34c6318f 100644
--- a/simpleperf/cmd_trace_sched.cpp
+++ b/simpleperf/cmd_trace_sched.cpp
@@ -20,9 +20,9 @@
 #include <unordered_map>
 #include <vector>
 
+#include <android-base/file.h>
 #include <android-base/logging.h>
 #include <android-base/stringprintf.h>
-#include <android-base/test_utils.h>
 
 #include "command.h"
 #include "event_selection_set.h"
diff --git a/simpleperf/cmd_trace_sched_test.cpp b/simpleperf/cmd_trace_sched_test.cpp
index e6178526..c7676491 100644
--- a/simpleperf/cmd_trace_sched_test.cpp
+++ b/simpleperf/cmd_trace_sched_test.cpp
@@ -22,7 +22,6 @@
 
 #include <android-base/file.h>
 #include <android-base/stringprintf.h>
-#include <android-base/test_utils.h>
 
 #include <map>
 #include <memory>
diff --git a/simpleperf/dso.h b/simpleperf/dso.h
index de45bf24..5bf898f8 100644
--- a/simpleperf/dso.h
+++ b/simpleperf/dso.h
@@ -22,8 +22,8 @@
 #include <unordered_map>
 #include <vector>
 
+#include <android-base/file.h>
 #include <android-base/logging.h>
-#include <android-base/test_utils.h>
 
 #include "build_id.h"
 #include "read_elf.h"
diff --git a/simpleperf/dso_test.cpp b/simpleperf/dso_test.cpp
index a9479c8e..e1265754 100644
--- a/simpleperf/dso_test.cpp
+++ b/simpleperf/dso_test.cpp
@@ -20,7 +20,6 @@
 
 #include <android-base/file.h>
 #include <android-base/stringprintf.h>
-#include <android-base/test_utils.h>
 
 #include "get_test_data.h"
 #include "read_apk.h"
diff --git a/simpleperf/environment.h b/simpleperf/environment.h
index 8e791ab3..10a6a8c2 100644
--- a/simpleperf/environment.h
+++ b/simpleperf/environment.h
@@ -30,7 +30,7 @@
 #include <string>
 #include <vector>
 
-#include <android-base/test_utils.h>
+#include <android-base/file.h>
 
 #include "build_id.h"
 #include "perf_regs.h"
diff --git a/simpleperf/environment_test.cpp b/simpleperf/environment_test.cpp
index 045194c3..dec9649c 100644
--- a/simpleperf/environment_test.cpp
+++ b/simpleperf/environment_test.cpp
@@ -17,7 +17,6 @@
 #include <gtest/gtest.h>
 
 #include <android-base/file.h>
-#include <android-base/test_utils.h>
 
 #include "dso.h"
 #include "environment.h"
diff --git a/simpleperf/gtest_main.cpp b/simpleperf/gtest_main.cpp
index 5061de9b..cf409924 100644
--- a/simpleperf/gtest_main.cpp
+++ b/simpleperf/gtest_main.cpp
@@ -23,7 +23,6 @@
 #include <android-base/file.h>
 #include <android-base/logging.h>
 #include <android-base/strings.h>
-#include <android-base/test_utils.h>
 #include <ziparchive/zip_archive.h>
 
 #if defined(__ANDROID__)
diff --git a/simpleperf/read_elf_test.cpp b/simpleperf/read_elf_test.cpp
index cbc26bf2..55a9cde9 100644
--- a/simpleperf/read_elf_test.cpp
+++ b/simpleperf/read_elf_test.cpp
@@ -21,7 +21,6 @@
 #include <map>
 
 #include <android-base/file.h>
-#include <android-base/test_utils.h>
 
 #include "get_test_data.h"
 #include "test_util.h"
diff --git a/simpleperf/record_file_test.cpp b/simpleperf/record_file_test.cpp
index daa6ea80..7eb1b6e5 100644
--- a/simpleperf/record_file_test.cpp
+++ b/simpleperf/record_file_test.cpp
@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include <android-base/test_utils.h>
+#include <android-base/file.h>
 
 #include "environment.h"
 #include "event_attr.h"
diff --git a/simpleperf/test_util.h b/simpleperf/test_util.h
index 006ae2fd..2ae96568 100644
--- a/simpleperf/test_util.h
+++ b/simpleperf/test_util.h
@@ -20,7 +20,6 @@
 #include <vector>
 
 #include <android-base/file.h>
-#include <android-base/test_utils.h>
 
 #include "environment.h"
 #include "read_elf.h"
diff --git a/verity/verity_verifier.cpp b/verity/verity_verifier.cpp
index bb4b6c27..036e85be 100644
--- a/verity/verity_verifier.cpp
+++ b/verity/verity_verifier.cpp
@@ -22,7 +22,6 @@
 #include <string>
 
 #include <android-base/file.h>
-#include <android-base/test_utils.h>
 #include <android-base/unique_fd.h>
 #include <crypto_utils/android_pubkey.h>
 #include <fec/io.h>