From 739991dcd2bbc34b6359ac1878134f2bb968bf4f Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Mon, 12 Nov 2018 12:45:59 -0800
Subject: [PATCH] switch to using android-base/file.h instead of
 android-base/test_utils.h

Test: compile
Bug: 119313545
Change-Id: I4f7ad84743e974b4b4d1d7256088f6c8b749a237
---
 adb_io_test.cpp        | 1 -
 adb_utils_test.cpp     | 2 +-
 client/adb_install.cpp | 1 -
 sysdeps/stat_test.cpp  | 2 +-
 sysdeps_win32_test.cpp | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/adb_io_test.cpp b/adb_io_test.cpp
index 611b2393..91b73a9a 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 341323fa..870f6f04 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 0008f720..7f37c454 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 2c2e0eee..67155d99 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 529b2121..183cd5b5 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