switch to using android-base/file.h instead of android-base/test_utils.h
Test: compile
Bug: 119313545
Change-Id: I664fb32522d01909c603d7b903475c4e9aea9223
diff --git a/cmds/incident_helper/tests/ih_util_test.cpp b/cmds/incident_helper/tests/ih_util_test.cpp
index efe714d..670881a 100644
--- a/cmds/incident_helper/tests/ih_util_test.cpp
+++ b/cmds/incident_helper/tests/ih_util_test.cpp
@@ -17,7 +17,6 @@
#include "ih_util.h"
#include <android-base/file.h>
-#include <android-base/test_utils.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <string>
diff --git a/cmds/incidentd/tests/FdBuffer_test.cpp b/cmds/incidentd/tests/FdBuffer_test.cpp
index 9d208df..3f92c2a 100644
--- a/cmds/incidentd/tests/FdBuffer_test.cpp
+++ b/cmds/incidentd/tests/FdBuffer_test.cpp
@@ -17,13 +17,13 @@
#include "FdBuffer.h"
#include "incidentd_util.h"
-#include <android-base/file.h>
-#include <android-base/test_utils.h>
#include <fcntl.h>
-#include <gtest/gtest.h>
#include <signal.h>
#include <string.h>
+#include <android-base/file.h>
+#include <gtest/gtest.h>
+
using namespace android;
using namespace android::base;
using namespace android::os::incidentd;
diff --git a/cmds/incidentd/tests/Reporter_test.cpp b/cmds/incidentd/tests/Reporter_test.cpp
index cf107c8..b863d15 100644
--- a/cmds/incidentd/tests/Reporter_test.cpp
+++ b/cmds/incidentd/tests/Reporter_test.cpp
@@ -19,12 +19,12 @@
#include <android/os/BnIncidentReportStatusListener.h>
#include <frameworks/base/libs/incident/proto/android/os/header.pb.h>
-#include <android-base/file.h>
-#include <android-base/test_utils.h>
#include <dirent.h>
+#include <string.h>
+
+#include <android-base/file.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include <string.h>
using namespace android;
using namespace android::base;
@@ -197,4 +197,4 @@
EXPECT_EQ(1, metadata.request_size());
EXPECT_TRUE(metadata.use_dropbox());
EXPECT_EQ(0, metadata.sections_size());
-}
\ No newline at end of file
+}
diff --git a/tools/aapt2/io/FileStream_test.cpp b/tools/aapt2/io/FileStream_test.cpp
index 7872738..cc9cd28 100644
--- a/tools/aapt2/io/FileStream_test.cpp
+++ b/tools/aapt2/io/FileStream_test.cpp
@@ -18,7 +18,6 @@
#include "android-base/file.h"
#include "android-base/macros.h"
-#include "android-base/test_utils.h"
#include "test/Test.h"