switch to using android-base/file.h instead of android-base/test_utils.h
Test: compile
Bug: 119313545
Change-Id: I4f7ad84743e974b4b4d1d7256088f6c8b749a237
diff --git a/adb_io_test.cpp b/adb_io_test.cpp
index 611b239..91b73a9 100644
--- a/adb_io_test.cpp
+++ b/adb_io_test.cpp
@@ -28,7 +28,6 @@
#include <string>
#include <android-base/file.h>
-#include <android-base/test_utils.h>
// All of these tests fail on Windows because they use the C Runtime open(),
// but the adb_io APIs expect file descriptors from adb_open(). This could
diff --git a/adb_utils_test.cpp b/adb_utils_test.cpp
index 341323f..870f6f0 100644
--- a/adb_utils_test.cpp
+++ b/adb_utils_test.cpp
@@ -30,8 +30,8 @@
#include "sysdeps.h"
+#include <android-base/file.h>
#include <android-base/macros.h>
-#include <android-base/test_utils.h>
#ifdef _WIN32
static std::string subdir(const char* parent, const char* child) {
diff --git a/client/adb_install.cpp b/client/adb_install.cpp
index 0008f72..7f37c45 100644
--- a/client/adb_install.cpp
+++ b/client/adb_install.cpp
@@ -30,7 +30,6 @@
#include "android-base/file.h"
#include "android-base/stringprintf.h"
#include "android-base/strings.h"
-#include "android-base/test_utils.h"
#include "client/file_sync_client.h"
#include "commandline.h"
#include "fastdeploy.h"
diff --git a/sysdeps/stat_test.cpp b/sysdeps/stat_test.cpp
index 2c2e0ee..67155d9 100644
--- a/sysdeps/stat_test.cpp
+++ b/sysdeps/stat_test.cpp
@@ -16,7 +16,7 @@
#include <string>
-#include <android-base/test_utils.h>
+#include <android-base/file.h>
#include <gtest/gtest.h>
#include "adb_utils.h"
diff --git a/sysdeps_win32_test.cpp b/sysdeps_win32_test.cpp
index 529b212..183cd5b 100644
--- a/sysdeps_win32_test.cpp
+++ b/sysdeps_win32_test.cpp
@@ -18,7 +18,7 @@
#include "sysdeps.h"
-#include <android-base/test_utils.h>
+#include <android-base/file.h>
TEST(sysdeps_win32, adb_getenv) {
// Insert all test env vars before first call to adb_getenv() which will