Revert "Revert "IWYU for tests starting with 'D'.""

This reverts commit edf8449d2c3663350b6b6e30d2fa4c70da02deef.

Change-Id: Ibeedd9965855b3ccfe44486d15307bf3da15fd9c
Reviewed-on: https://skia-review.googlesource.com/129516
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

1 files changed, 11 insertions, 5 deletions

diff --git a/tests/DataRefTest.cpp b/tests/DataRefTest.cpp
index 74d511cc28..e7ada5f09d 100644
--- a/tests/DataRefTest.cpp
+++ b/tests/DataRefTest.cpp
@@ -9,12 +9,21 @@
 #include "SkDataTable.h"
 #include "SkOSFile.h"
 #include "SkOSPath.h"
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
+#include "SkRWBuffer.h"
+#include "SkRefCnt.h"
 #include "SkStream.h"
+#include "SkString.h"
 #include "SkTArray.h"
+#include "SkTaskGroup.h"
+#include "SkTemplates.h"
+#include "SkTypes.h"
 #include "Test.h"
 
+#include <cstdio>
+#include <cstring>
+#include <memory>
+#include <utility>
+
 static void test_is_equal(skiatest::Reporter* reporter,
                           const SkDataTable* a, const SkDataTable* b) {
     REPORTER_ASSERT(reporter, a->count() == b->count());
@@ -201,7 +210,6 @@ DEF_TEST(Data, reporter) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "SkRWBuffer.h"
 
 const char gABC[] = "abcdefghijklmnopqrstuvwxyz";
 
@@ -251,8 +259,6 @@ static void check_alphabet_buffer(skiatest::Reporter* reporter, const SkROBuffer
     check_abcs(reporter, storage.get(), size);
 }
 
-#include "SkTaskGroup.h"
-
 DEF_TEST(RWBuffer, reporter) {
     // Knowing that the default capacity is 4096, choose N large enough so we force it to use
     // multiple buffers internally.