From 7751045a3aede1e938a1ab0a390db25bb3fafa0b Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Wed, 14 Nov 2018 15:03:18 -0800
Subject: Remove unused reference to android-base/test_utils.h

Test: compile
Bug: 119313545
Change-Id: I5e289469b40ccf5bf17982197a3cdefad1254f78
---
 cmds/incidentd/tests/Throttler_test.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmds/incidentd/tests/Throttler_test.cpp b/cmds/incidentd/tests/Throttler_test.cpp
index 8488c995c0fa..b35228c09253 100644
--- a/cmds/incidentd/tests/Throttler_test.cpp
+++ b/cmds/incidentd/tests/Throttler_test.cpp
@@ -16,7 +16,6 @@
 
 #include "Throttler.h"
 
-#include <android-base/test_utils.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-- 
cgit v1.2.3-59-g8ed1b


From d100107806bc02f8f9866790e0df8975d4764d4a Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Wed, 14 Nov 2018 15:13:39 -0800
Subject: switch to using android-base/file.h instead of
 android-base/test_utils.h

Test: compile
Bug: 119313545
Change-Id: I664fb32522d01909c603d7b903475c4e9aea9223
---
 cmds/incident_helper/tests/ih_util_test.cpp | 1 -
 cmds/incidentd/tests/FdBuffer_test.cpp      | 6 +++---
 cmds/incidentd/tests/Reporter_test.cpp      | 8 ++++----
 tools/aapt2/io/FileStream_test.cpp          | 1 -
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/cmds/incident_helper/tests/ih_util_test.cpp b/cmds/incident_helper/tests/ih_util_test.cpp
index efe714d98b18..670881a96cab 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 9d208dffdca6..3f92c2a18328 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 cf107c858cca..b863d150c9cd 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 @@ TEST_F(ReporterTest, ReportMetadata) {
     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 7872738320c3..cc9cd2808a0c 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"
 
-- 
cgit v1.2.3-59-g8ed1b