minidump: Use forward declarations in more places.

TEST=minidump_test
R=rsesek@chromium.org

Review URL: https://codereview.chromium.org/679443002

minidump/minidump_context_writer.cc

@@ -15,6 +15,7 @@
 #include "minidump/minidump_context_writer.h"
 
 #include "base/logging.h"
+#include "util/file/file_writer.h"
 
 namespace crashpad {
 

minidump/minidump_context_writer.h

@@ -20,7 +20,6 @@
 #include "base/basictypes.h"
 #include "minidump/minidump_context.h"
 #include "minidump/minidump_writable.h"
-#include "util/file/file_writer.h"
 
 namespace crashpad {
 

minidump/minidump_crashpad_info_writer.cc

@@ -15,6 +15,7 @@
 #include "minidump/minidump_crashpad_info_writer.h"
 
 #include "base/logging.h"
+#include "util/file/file_writer.h"
 
 namespace crashpad {
 

minidump/minidump_crashpad_info_writer.h

@@ -26,7 +26,6 @@
 #include "minidump/minidump_simple_string_dictionary_writer.h"
 #include "minidump/minidump_stream_writer.h"
 #include "minidump/minidump_writable.h"
-#include "util/file/file_writer.h"
 
 namespace crashpad {
 

minidump/minidump_exception_writer.cc

@@ -14,7 +14,11 @@
 
 #include "minidump/minidump_exception_writer.h"
 
+#include <sys/types.h>
+
 #include "base/logging.h"
+#include "minidump/minidump_context_writer.h"
+#include "util/file/file_writer.h"
 
 namespace crashpad {
 

minidump/minidump_exception_writer.h

@@ -17,17 +17,16 @@
 
 #include <dbghelp.h>
 #include <stdint.h>
-#include <sys/types.h>
 
 #include <vector>
 
 #include "base/basictypes.h"
-#include "minidump/minidump_context_writer.h"
 #include "minidump/minidump_stream_writer.h"
-#include "util/file/file_writer.h"
 
 namespace crashpad {
 
+class MinidumpContextWriter;
+
 //! \brief The writer for a MINIDUMP_EXCEPTION_STREAM stream in a minidump file.
 class MinidumpExceptionWriter final : public internal::MinidumpStreamWriter {
  public:

minidump/minidump_exception_writer_test.cc

@@ -16,6 +16,7 @@
 
 #include <dbghelp.h>
 #include <stdint.h>
+#include <sys/types.h>
 
 #include <string>
 #include <vector>

minidump/minidump_file_writer.cc

@@ -16,6 +16,7 @@
 
 #include "base/logging.h"
 #include "minidump/minidump_writer_util.h"
+#include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace crashpad {

minidump/minidump_file_writer.h

@@ -22,9 +22,9 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "minidump/minidump_extensions.h"
 #include "minidump/minidump_stream_writer.h"
 #include "minidump/minidump_writable.h"
-#include "util/file/file_writer.h"
 
 namespace crashpad {
 

minidump/minidump_memory_writer.cc

@@ -15,6 +15,7 @@
 #include "minidump/minidump_memory_writer.h"
 
 #include "base/logging.h"
+#include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace crashpad {

minidump/minidump_memory_writer.h

@@ -16,6 +16,7 @@
 #define CRASHPAD_MINIDUMP_MINIDUMP_MEMORY_WRITER_H_
 
 #include <dbghelp.h>
+#include <stdint.h>
 #include <sys/types.h>
 
 #include <vector>
@@ -23,7 +24,6 @@
 #include "base/basictypes.h"
 #include "minidump/minidump_stream_writer.h"
 #include "minidump/minidump_writable.h"
-#include "util/file/file_writer.h"
 
 namespace crashpad {
 

minidump/minidump_misc_info_writer.cc

@@ -18,6 +18,7 @@
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "minidump/minidump_writer_util.h"
+#include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace crashpad {

minidump/minidump_misc_info_writer.h

@@ -25,7 +25,6 @@
 #include "base/basictypes.h"
 #include "minidump/minidump_stream_writer.h"
 #include "minidump/minidump_writable.h"
-#include "util/file/file_writer.h"
 
 namespace crashpad {
 

minidump/minidump_module_writer.cc

@@ -14,9 +14,12 @@
 
 #include "minidump/minidump_module_writer.h"
 
+#include <sys/types.h>
+
 #include "base/logging.h"
 #include "minidump/minidump_string_writer.h"
 #include "minidump/minidump_writer_util.h"
+#include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace crashpad {

minidump/minidump_module_writer.h

@@ -17,7 +17,6 @@
 
 #include <dbghelp.h>
 #include <stdint.h>
-#include <sys/types.h>
 #include <time.h>
 
 #include <string>
@@ -29,7 +28,6 @@
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_stream_writer.h"
 #include "minidump/minidump_writable.h"
-#include "util/file/file_writer.h"
 
 namespace crashpad {
 

minidump/minidump_module_writer_test.cc

@@ -17,6 +17,7 @@
 #include <dbghelp.h>
 #include <stdint.h>
 #include <string.h>
+#include <sys/types.h>
 
 #include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"

minidump/minidump_simple_string_dictionary_writer.cc

@@ -15,6 +15,7 @@
 #include "minidump/minidump_simple_string_dictionary_writer.h"
 
 #include "base/logging.h"
+#include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace crashpad {

minidump/minidump_simple_string_dictionary_writer.h

@@ -25,7 +25,6 @@
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_string_writer.h"
 #include "minidump/minidump_writable.h"
-#include "util/file/file_writer.h"
 
 namespace crashpad {
 

minidump/minidump_stream_writer.h

@@ -16,7 +16,6 @@
 #define CRASHPAD_MINIDUMP_MINIDUMP_STREAM_WRITER_H_
 
 #include <dbghelp.h>
-#include <stdint.h>
 
 #include "base/basictypes.h"
 #include "minidump/minidump_extensions.h"

minidump/minidump_string_writer.cc

@@ -14,8 +14,11 @@
 
 #include "minidump/minidump_string_writer.h"
 
+#include <sys/types.h>
+
 #include "base/logging.h"
 #include "minidump/minidump_writer_util.h"
+#include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace crashpad {

minidump/minidump_string_writer.h

@@ -16,8 +16,6 @@
 #define CRASHPAD_MINIDUMP_MINIDUMP_STRING_WRITER_H_
 
 #include <dbghelp.h>
-#include <stdint.h>
-#include <sys/types.h>
 
 #include <string>
 
@@ -25,7 +23,6 @@
 #include "base/strings/string16.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_writable.h"
-#include "util/file/file_writer.h"
 
 namespace crashpad {
 namespace internal {

minidump/minidump_string_writer_test.cc

@@ -15,6 +15,7 @@
 #include "minidump/minidump_string_writer.h"
 
 #include <dbghelp.h>
+#include <sys/types.h>
 
 #include <string>
 

minidump/minidump_system_info_writer.cc

@@ -15,9 +15,11 @@
 #include "minidump/minidump_system_info_writer.h"
 
 #include <string.h>
+#include <sys/types.h>
 
 #include "base/logging.h"
 #include "minidump/minidump_string_writer.h"
+#include "util/file/file_writer.h"
 
 namespace crashpad {
 

minidump/minidump_system_info_writer.h

@@ -17,7 +17,6 @@
 
 #include <dbghelp.h>
 #include <stdint.h>
-#include <sys/types.h>
 
 #include <string>
 #include <vector>
@@ -27,7 +26,6 @@
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_stream_writer.h"
 #include "minidump/minidump_writable.h"
-#include "util/file/file_writer.h"
 
 namespace crashpad {
 

minidump/minidump_system_info_writer_test.cc

@@ -16,6 +16,7 @@
 
 #include <dbghelp.h>
 #include <string.h>
+#include <sys/types.h>
 
 #include <string>
 

minidump/minidump_thread_writer.cc

@@ -14,9 +14,12 @@
 
 #include "minidump/minidump_thread_writer.h"
 
+#include <sys/types.h>
+
 #include "base/logging.h"
 #include "minidump/minidump_context_writer.h"
 #include "minidump/minidump_memory_writer.h"
+#include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace crashpad {

minidump/minidump_thread_writer.h

@@ -17,14 +17,12 @@
 
 #include <dbghelp.h>
 #include <stdint.h>
-#include <sys/types.h>
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "minidump/minidump_stream_writer.h"
 #include "minidump/minidump_writable.h"
-#include "util/file/file_writer.h"
 
 namespace crashpad {
 

minidump/minidump_thread_writer_test.cc

@@ -15,6 +15,7 @@
 #include "minidump/minidump_thread_writer.h"
 
 #include <dbghelp.h>
+#include <sys/types.h>
 
 #include "gtest/gtest.h"
 #include "minidump/minidump_context_writer.h"

minidump/minidump_writable.cc

@@ -14,7 +14,12 @@
 
 #include "minidump/minidump_writable.h"
 
+#include <stdint.h>
+
+#include <limits>
+
 #include "base/logging.h"
+#include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace {

minidump/minidump_writable.h

@@ -16,16 +16,16 @@
 #define CRASHPAD_MINIDUMP_MINIDUMP_WRITABLE_H_
 
 #include <dbghelp.h>
-#include <stdint.h>
 #include <sys/types.h>
 
-#include <limits>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "util/file/file_writer.h"
 
 namespace crashpad {
+
+class FileWriterInterface;
+
 namespace internal {
 
 //! \brief The base class for all content that might be written to a minidump