commit 9f1cf25332e33247b1b036ce07b32d09e076c346
author Mark Salyzyn <salyzyn@google.com> Mon Nov 12 12:45:59 2018 -0800
committer Mark Salyzyn <salyzyn@google.com> Wed Nov 14 09:35:34 2018 -0800
tree a20e2aaa8b6fa38a292bb7dd90dfadecf68b2ebd
parent e77298ce9fd0fbb6e94108f4c49c11f5efa856e1

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

Test: compile
Bug: 119313545
Change-Id: I4f7ad84743e974b4b4d1d7256088f6c8b749a237

base/file_test.cpp

diff --git a/base/file_test.cpp b/base/file_test.cpp
index 6794652..f64e81c 100644
--- a/base/file_test.cpp
+++ b/base/file_test.cpp
@@ -24,8 +24,6 @@
 
 #include <string>
 
-#include "android-base/test_utils.h"
-
 #if !defined(_WIN32)
 #include <pwd.h>
 #endif

base/mapped_file_test.cpp

diff --git a/base/mapped_file_test.cpp b/base/mapped_file_test.cpp
index 57fde6f..7e89723 100644
--- a/base/mapped_file_test.cpp
+++ b/base/mapped_file_test.cpp
@@ -25,7 +25,6 @@
 #include <string>
 
 #include "android-base/file.h"
-#include "android-base/test_utils.h"
 #include "android-base/unique_fd.h"
 
 TEST(mapped_file, smoke) {

base/utf8_test.cpp

diff --git a/base/utf8_test.cpp b/base/utf8_test.cpp
index fcb25c3..472e82c 100644
--- a/base/utf8_test.cpp
+++ b/base/utf8_test.cpp
@@ -21,8 +21,8 @@
 #include <fcntl.h>
 #include <stdlib.h>
 
+#include "android-base/file.h"
 #include "android-base/macros.h"
-#include "android-base/test_utils.h"
 #include "android-base/unique_fd.h"
 
 namespace android {