diff --git a/DEPS b/DEPS index ed993d70..6e9d080e 100644 --- a/DEPS +++ b/DEPS @@ -25,7 +25,7 @@ deps = { '01528c7244837168a1c80f06ff60fa5a9793c824', 'crashpad/third_party/mini_chromium/mini_chromium': Var('chromium_git') + '/chromium/mini_chromium@' + - '43f04e7299621f708801bf475c84d9f294826ff9', + '8a2363f486e3a0dc562a68884832d06d28d38dcc', 'buildtools': Var('chromium_git') + '/chromium/buildtools.git@' + 'c2f259809d5ede3275df5ea0842f0431990c4f98', diff --git a/client/crash_report_database.h b/client/crash_report_database.h index 1897d2ec..550fd3cc 100644 --- a/client/crash_report_database.h +++ b/client/crash_report_database.h @@ -20,8 +20,8 @@ #include #include -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "util/file/file_io.h" #include "util/misc/uuid.h" diff --git a/client/crash_report_database_win.cc b/client/crash_report_database_win.cc index d7968bd1..d408b54d 100644 --- a/client/crash_report_database_win.cc +++ b/client/crash_report_database_win.cc @@ -14,9 +14,12 @@ #include "client/crash_report_database.h" -#include -#include #include +#include +#include +#include +#include +#include #include diff --git a/client/crashpad_client.h b/client/crashpad_client.h index 79a4900e..28a87a3e 100644 --- a/client/crashpad_client.h +++ b/client/crashpad_client.h @@ -19,8 +19,8 @@ #include #include -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "build/build_config.h" #if defined(OS_MACOSX) diff --git a/client/crashpad_client_mac.cc b/client/crashpad_client_mac.cc index cce11d1e..97f5504a 100644 --- a/client/crashpad_client_mac.cc +++ b/client/crashpad_client_mac.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include diff --git a/client/crashpad_client_win.cc b/client/crashpad_client_win.cc index c7cb09a9..79412abc 100644 --- a/client/crashpad_client_win.cc +++ b/client/crashpad_client_win.cc @@ -14,8 +14,9 @@ #include "client/crashpad_client.h" -#include #include +#include +#include #include "base/atomicops.h" #include "base/logging.h" diff --git a/client/crashpad_info.h b/client/crashpad_info.h index c2182c0d..1c4997ab 100644 --- a/client/crashpad_info.h +++ b/client/crashpad_info.h @@ -15,10 +15,9 @@ #ifndef CRASHPAD_CLIENT_CRASHPAD_INFO_H_ #define CRASHPAD_CLIENT_CRASHPAD_INFO_H_ -#include "base/basictypes.h" - #include +#include "base/macros.h" #include "build/build_config.h" #include "client/simple_string_dictionary.h" #include "util/misc/tri_state.h" diff --git a/client/prune_crash_reports.cc b/client/prune_crash_reports.cc index d94f212c..03392492 100644 --- a/client/prune_crash_reports.cc +++ b/client/prune_crash_reports.cc @@ -20,6 +20,7 @@ #include #include "base/logging.h" +#include "build/build_config.h" namespace crashpad { diff --git a/client/prune_crash_reports.h b/client/prune_crash_reports.h index 1c1ce9c3..3f13991d 100644 --- a/client/prune_crash_reports.h +++ b/client/prune_crash_reports.h @@ -15,9 +15,10 @@ #ifndef CRASHPAD_CLIENT_PRUNE_CRASH_REPORTS_H_ #define CRASHPAD_CLIENT_PRUNE_CRASH_REPORTS_H_ -#include #include +#include +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "client/crash_report_database.h" diff --git a/client/settings.cc b/client/settings.cc index b991a388..d018e37f 100644 --- a/client/settings.cc +++ b/client/settings.cc @@ -14,6 +14,8 @@ #include "client/settings.h" +#include + #include #include "base/logging.h" diff --git a/client/settings.h b/client/settings.h index 016f8d84..b64f74fb 100644 --- a/client/settings.h +++ b/client/settings.h @@ -19,8 +19,8 @@ #include -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/scoped_generic.h" #include "util/file/file_io.h" #include "util/misc/initialization_state.h" diff --git a/client/settings_test.cc b/client/settings_test.cc index 203bd215..08c24b4c 100644 --- a/client/settings_test.cc +++ b/client/settings_test.cc @@ -14,6 +14,7 @@ #include "client/settings.h" +#include "build/build_config.h" #include "gtest/gtest.h" #include "test/errors.h" #include "test/scoped_temp_dir.h" diff --git a/client/simple_string_dictionary.h b/client/simple_string_dictionary.h index edaca6fb..2fb19bba 100644 --- a/client/simple_string_dictionary.h +++ b/client/simple_string_dictionary.h @@ -16,9 +16,10 @@ #define CRASHPAD_CLIENT_SIMPLE_STRING_DICTIONARY_H_ #include +#include -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "util/misc/implicit_cast.h" namespace crashpad { diff --git a/client/simulate_crash_mac.cc b/client/simulate_crash_mac.cc index 71d5d904..7e279015 100644 --- a/client/simulate_crash_mac.cc +++ b/client/simulate_crash_mac.cc @@ -15,11 +15,12 @@ #include "client/simulate_crash_mac.h" #include +#include -#include "base/basictypes.h" #include "base/logging.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "util/mach/exc_client_variants.h" diff --git a/client/simulate_crash_mac_test.cc b/client/simulate_crash_mac_test.cc index 8953114a..87c5f845 100644 --- a/client/simulate_crash_mac_test.cc +++ b/client/simulate_crash_mac_test.cc @@ -16,8 +16,9 @@ #include #include +#include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "gtest/gtest.h" diff --git a/compat/non_win/winnt.h b/compat/non_win/winnt.h index 03167aa5..82af0e6d 100644 --- a/compat/non_win/winnt.h +++ b/compat/non_win/winnt.h @@ -15,6 +15,8 @@ #ifndef CRASHPAD_COMPAT_NON_WIN_WINNT_H_ #define CRASHPAD_COMPAT_NON_WIN_WINNT_H_ +#include + //! \file //! \anchor VER_SUITE_x diff --git a/handler/crash_report_upload_thread.h b/handler/crash_report_upload_thread.h index f015ef94..ee5a6fdb 100644 --- a/handler/crash_report_upload_thread.h +++ b/handler/crash_report_upload_thread.h @@ -15,10 +15,9 @@ #ifndef CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_THREAD_H_ #define CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_THREAD_H_ -#include "base/basictypes.h" - #include +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "client/crash_report_database.h" #include "util/thread/worker_thread.h" @@ -136,6 +135,8 @@ class CrashReportUploadThread : public WorkerThread::Delegate { std::string url_; WorkerThread thread_; CrashReportDatabase* database_; // weak + + DISALLOW_COPY_AND_ASSIGN(CrashReportUploadThread); }; } // namespace crashpad diff --git a/handler/handler_main.cc b/handler/handler_main.cc index 19d0da7a..d27010e6 100644 --- a/handler/handler_main.cc +++ b/handler/handler_main.cc @@ -15,6 +15,7 @@ #include "handler/handler_main.h" #include +#include #include #include @@ -32,9 +33,9 @@ #include "client/crash_report_database.h" #include "client/crashpad_client.h" #include "client/prune_crash_reports.h" -#include "tools/tool_support.h" #include "handler/crash_report_upload_thread.h" #include "handler/prune_crash_reports_thread.h" +#include "tools/tool_support.h" #include "util/file/file_io.h" #include "util/stdlib/map_insert.h" #include "util/stdlib/string_number_conversion.h" diff --git a/handler/mac/crash_report_exception_handler.h b/handler/mac/crash_report_exception_handler.h index a09c6b86..63d9bef3 100644 --- a/handler/mac/crash_report_exception_handler.h +++ b/handler/mac/crash_report_exception_handler.h @@ -20,7 +20,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "client/crash_report_database.h" #include "handler/crash_report_upload_thread.h" #include "util/mach/exc_server_variants.h" diff --git a/handler/mac/exception_handler_server.h b/handler/mac/exception_handler_server.h index 421038e3..7d893002 100644 --- a/handler/mac/exception_handler_server.h +++ b/handler/mac/exception_handler_server.h @@ -15,11 +15,10 @@ #ifndef CRASHPAD_HANDLER_MAC_EXCEPTION_HANDLER_SERVER_H_ #define CRASHPAD_HANDLER_MAC_EXCEPTION_HANDLER_SERVER_H_ -#include "base/basictypes.h" - #include #include "base/mac/scoped_mach_port.h" +#include "base/macros.h" #include "util/mach/exc_server_variants.h" namespace crashpad { diff --git a/handler/prune_crash_reports_thread.h b/handler/prune_crash_reports_thread.h index d4eb1253..fbdda527 100644 --- a/handler/prune_crash_reports_thread.h +++ b/handler/prune_crash_reports_thread.h @@ -15,7 +15,7 @@ #ifndef CRASHPAD_HANDLER_PRUNE_CRASH_REPORTS_THREAD_H_ #define CRASHPAD_HANDLER_PRUNE_CRASH_REPORTS_THREAD_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "util/thread/worker_thread.h" diff --git a/handler/win/crash_report_exception_handler.h b/handler/win/crash_report_exception_handler.h index f03da161..11b440c4 100644 --- a/handler/win/crash_report_exception_handler.h +++ b/handler/win/crash_report_exception_handler.h @@ -20,6 +20,7 @@ #include #include +#include "base/macros.h" #include "util/win/exception_handler_server.h" namespace crashpad { diff --git a/handler/win/crashy_test_program.cc b/handler/win/crashy_test_program.cc index 847093a3..be03d4cd 100644 --- a/handler/win/crashy_test_program.cc +++ b/handler/win/crashy_test_program.cc @@ -14,25 +14,26 @@ #include #include +#include #include #include -#include #include +#include #include +#include "base/files/file_path.h" +#include "base/logging.h" +#include "base/macros.h" +#include "client/crashpad_client.h" +#include "util/win/critical_section_with_debug_info.h" +#include "util/win/get_function.h" + // ntstatus.h conflicts with windows.h so define this locally. #ifndef STATUS_NO_SUCH_FILE #define STATUS_NO_SUCH_FILE static_cast(0xC000000F) #endif -#include "base/basictypes.h" -#include "base/files/file_path.h" -#include "base/logging.h" -#include "client/crashpad_client.h" -#include "util/win/critical_section_with_debug_info.h" -#include "util/win/get_function.h" - namespace crashpad { namespace { diff --git a/minidump/minidump_context_writer.cc b/minidump/minidump_context_writer.cc index fef1af31..114859ee 100644 --- a/minidump/minidump_context_writer.cc +++ b/minidump/minidump_context_writer.cc @@ -14,6 +14,7 @@ #include "minidump/minidump_context_writer.h" +#include #include #include "base/compiler_specific.h" diff --git a/minidump/minidump_context_writer.h b/minidump/minidump_context_writer.h index e48650e3..10de6900 100644 --- a/minidump/minidump_context_writer.h +++ b/minidump/minidump_context_writer.h @@ -17,7 +17,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_context.h" #include "minidump/minidump_writable.h" diff --git a/minidump/minidump_crashpad_info_writer.h b/minidump/minidump_crashpad_info_writer.h index 99945dad..b83aeaa8 100644 --- a/minidump/minidump_crashpad_info_writer.h +++ b/minidump/minidump_crashpad_info_writer.h @@ -15,9 +15,11 @@ #ifndef CRASHPAD_MINIDUMP_MINIDUMP_CRASHPAD_INFO_WRITER_H_ #define CRASHPAD_MINIDUMP_MINIDUMP_CRASHPAD_INFO_WRITER_H_ +#include + #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_stream_writer.h" diff --git a/minidump/minidump_exception_writer.cc b/minidump/minidump_exception_writer.cc index cd471b9c..c1181ad7 100644 --- a/minidump/minidump_exception_writer.cc +++ b/minidump/minidump_exception_writer.cc @@ -14,8 +14,6 @@ #include "minidump/minidump_exception_writer.h" -#include - #include #include "base/logging.h" diff --git a/minidump/minidump_exception_writer.h b/minidump/minidump_exception_writer.h index b4de21a5..a81abfb2 100644 --- a/minidump/minidump_exception_writer.h +++ b/minidump/minidump_exception_writer.h @@ -18,10 +18,11 @@ #include #include #include +#include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_stream_writer.h" #include "minidump/minidump_thread_id_map.h" diff --git a/minidump/minidump_exception_writer_test.cc b/minidump/minidump_exception_writer_test.cc index bc3bfec9..68e501a4 100644 --- a/minidump/minidump_exception_writer_test.cc +++ b/minidump/minidump_exception_writer_test.cc @@ -14,14 +14,8 @@ #include "minidump/minidump_exception_writer.h" -#include -#include -#include -#include - #include #include -#include #include "gtest/gtest.h" #include "minidump/minidump_context.h" diff --git a/minidump/minidump_file_writer.h b/minidump/minidump_file_writer.h index 8b738b64..5198148a 100644 --- a/minidump/minidump_file_writer.h +++ b/minidump/minidump_file_writer.h @@ -22,7 +22,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_stream_writer.h" diff --git a/minidump/minidump_file_writer_test.cc b/minidump/minidump_file_writer_test.cc index 314c758a..2fb7d299 100644 --- a/minidump/minidump_file_writer_test.cc +++ b/minidump/minidump_file_writer_test.cc @@ -14,14 +14,14 @@ #include "minidump/minidump_file_writer.h" -#include -#include +#include +#include #include #include -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "minidump/minidump_stream_writer.h" #include "minidump/minidump_writable.h" diff --git a/minidump/minidump_handle_writer.h b/minidump/minidump_handle_writer.h index 43bdac6b..f8eaeef9 100644 --- a/minidump/minidump_handle_writer.h +++ b/minidump/minidump_handle_writer.h @@ -17,6 +17,7 @@ #include #include +#include #include #include diff --git a/minidump/minidump_memory_info_writer.h b/minidump/minidump_memory_info_writer.h index 6f6ea59b..ec660197 100644 --- a/minidump/minidump_memory_info_writer.h +++ b/minidump/minidump_memory_info_writer.h @@ -18,10 +18,11 @@ #include #include #include +#include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "minidump/minidump_stream_writer.h" #include "minidump/minidump_writable.h" diff --git a/minidump/minidump_memory_writer.h b/minidump/minidump_memory_writer.h index 6b5f2dfe..e3e33e5c 100644 --- a/minidump/minidump_memory_writer.h +++ b/minidump/minidump_memory_writer.h @@ -22,7 +22,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_stream_writer.h" #include "minidump/minidump_writable.h" diff --git a/minidump/minidump_memory_writer_test.cc b/minidump/minidump_memory_writer_test.cc index cefe7475..7194a49b 100644 --- a/minidump/minidump_memory_writer_test.cc +++ b/minidump/minidump_memory_writer_test.cc @@ -14,14 +14,10 @@ #include "minidump/minidump_memory_writer.h" -#include -#include -#include - #include -#include "base/basictypes.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "minidump/minidump_extensions.h" diff --git a/minidump/minidump_misc_info_writer.h b/minidump/minidump_misc_info_writer.h index b7c35499..a558fc33 100644 --- a/minidump/minidump_misc_info_writer.h +++ b/minidump/minidump_misc_info_writer.h @@ -23,7 +23,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "minidump/minidump_stream_writer.h" #include "minidump/minidump_writable.h" diff --git a/minidump/minidump_misc_info_writer_test.cc b/minidump/minidump_misc_info_writer_test.cc index de8cde3b..2b5dbe44 100644 --- a/minidump/minidump_misc_info_writer_test.cc +++ b/minidump/minidump_misc_info_writer_test.cc @@ -14,15 +14,13 @@ #include "minidump/minidump_misc_info_writer.h" -#include -#include #include #include #include -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" diff --git a/minidump/minidump_module_crashpad_info_writer.cc b/minidump/minidump_module_crashpad_info_writer.cc index c4a09c33..7e341571 100644 --- a/minidump/minidump_module_crashpad_info_writer.cc +++ b/minidump/minidump_module_crashpad_info_writer.cc @@ -14,8 +14,6 @@ #include "minidump/minidump_module_crashpad_info_writer.h" -#include - #include #include "base/logging.h" diff --git a/minidump/minidump_module_crashpad_info_writer.h b/minidump/minidump_module_crashpad_info_writer.h index 601da7ee..0b25db69 100644 --- a/minidump/minidump_module_crashpad_info_writer.h +++ b/minidump/minidump_module_crashpad_info_writer.h @@ -20,7 +20,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_string_writer.h" diff --git a/minidump/minidump_module_writer.cc b/minidump/minidump_module_writer.cc index c3a0e839..05f837f7 100644 --- a/minidump/minidump_module_writer.cc +++ b/minidump/minidump_module_writer.cc @@ -14,8 +14,6 @@ #include "minidump/minidump_module_writer.h" -#include - #include #include diff --git a/minidump/minidump_module_writer.h b/minidump/minidump_module_writer.h index ecf3cb85..0b047e3f 100644 --- a/minidump/minidump_module_writer.h +++ b/minidump/minidump_module_writer.h @@ -18,12 +18,13 @@ #include #include #include +#include #include #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "minidump/minidump_extensions.h" diff --git a/minidump/minidump_module_writer_test.cc b/minidump/minidump_module_writer_test.cc index 8d6272de..aa5171e1 100644 --- a/minidump/minidump_module_writer_test.cc +++ b/minidump/minidump_module_writer_test.cc @@ -14,11 +14,7 @@ #include "minidump/minidump_module_writer.h" -#include -#include -#include #include -#include #include diff --git a/minidump/minidump_rva_list_writer.h b/minidump/minidump_rva_list_writer.h index 42bb1b51..cb17ef2b 100644 --- a/minidump/minidump_rva_list_writer.h +++ b/minidump/minidump_rva_list_writer.h @@ -20,7 +20,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_writable.h" diff --git a/minidump/minidump_simple_string_dictionary_writer.h b/minidump/minidump_simple_string_dictionary_writer.h index 88059bd8..975f019f 100644 --- a/minidump/minidump_simple_string_dictionary_writer.h +++ b/minidump/minidump_simple_string_dictionary_writer.h @@ -17,11 +17,11 @@ #include -#include #include +#include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_string_writer.h" diff --git a/minidump/minidump_simple_string_dictionary_writer_test.cc b/minidump/minidump_simple_string_dictionary_writer_test.cc index 1e401d45..a5b83ac4 100644 --- a/minidump/minidump_simple_string_dictionary_writer_test.cc +++ b/minidump/minidump_simple_string_dictionary_writer_test.cc @@ -14,6 +14,8 @@ #include "minidump/minidump_simple_string_dictionary_writer.h" +#include + #include #include #include diff --git a/minidump/minidump_stream_writer.h b/minidump/minidump_stream_writer.h index c812f5f9..894889ae 100644 --- a/minidump/minidump_stream_writer.h +++ b/minidump/minidump_stream_writer.h @@ -18,7 +18,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_writable.h" diff --git a/minidump/minidump_string_writer.cc b/minidump/minidump_string_writer.cc index bf40d256..5bf57dd9 100644 --- a/minidump/minidump_string_writer.cc +++ b/minidump/minidump_string_writer.cc @@ -14,8 +14,6 @@ #include "minidump/minidump_string_writer.h" -#include - #include #include "base/logging.h" diff --git a/minidump/minidump_string_writer.h b/minidump/minidump_string_writer.h index ec57179e..26fabf89 100644 --- a/minidump/minidump_string_writer.h +++ b/minidump/minidump_string_writer.h @@ -17,11 +17,12 @@ #include #include +#include #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "minidump/minidump_extensions.h" diff --git a/minidump/minidump_string_writer_test.cc b/minidump/minidump_string_writer_test.cc index aa8e48c6..09973213 100644 --- a/minidump/minidump_string_writer_test.cc +++ b/minidump/minidump_string_writer_test.cc @@ -14,15 +14,11 @@ #include "minidump/minidump_string_writer.h" -#include -#include -#include - #include -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" diff --git a/minidump/minidump_system_info_writer.cc b/minidump/minidump_system_info_writer.cc index 88687234..066363cb 100644 --- a/minidump/minidump_system_info_writer.cc +++ b/minidump/minidump_system_info_writer.cc @@ -15,7 +15,6 @@ #include "minidump/minidump_system_info_writer.h" #include -#include #include "base/logging.h" #include "minidump/minidump_string_writer.h" diff --git a/minidump/minidump_system_info_writer.h b/minidump/minidump_system_info_writer.h index a1653dcb..8ab2d8fa 100644 --- a/minidump/minidump_system_info_writer.h +++ b/minidump/minidump_system_info_writer.h @@ -18,11 +18,12 @@ #include #include #include +#include #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_stream_writer.h" diff --git a/minidump/minidump_system_info_writer_test.cc b/minidump/minidump_system_info_writer_test.cc index 88bb0e01..08f36f65 100644 --- a/minidump/minidump_system_info_writer_test.cc +++ b/minidump/minidump_system_info_writer_test.cc @@ -14,10 +14,7 @@ #include "minidump/minidump_system_info_writer.h" -#include -#include #include -#include #include #include diff --git a/minidump/minidump_thread_id_map_test.cc b/minidump/minidump_thread_id_map_test.cc index 058709e9..2fee93c0 100644 --- a/minidump/minidump_thread_id_map_test.cc +++ b/minidump/minidump_thread_id_map_test.cc @@ -14,9 +14,11 @@ #include "minidump/minidump_thread_id_map.h" +#include + #include -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "snapshot/test/test_thread_snapshot.h" diff --git a/minidump/minidump_thread_writer.cc b/minidump/minidump_thread_writer.cc index d41d2dd4..cc4339eb 100644 --- a/minidump/minidump_thread_writer.cc +++ b/minidump/minidump_thread_writer.cc @@ -14,8 +14,6 @@ #include "minidump/minidump_thread_writer.h" -#include - #include #include "base/logging.h" diff --git a/minidump/minidump_thread_writer.h b/minidump/minidump_thread_writer.h index f8b7d201..fba54816 100644 --- a/minidump/minidump_thread_writer.h +++ b/minidump/minidump_thread_writer.h @@ -18,10 +18,11 @@ #include #include #include +#include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_stream_writer.h" #include "minidump/minidump_thread_id_map.h" diff --git a/minidump/minidump_thread_writer_test.cc b/minidump/minidump_thread_writer_test.cc index ab0561a9..86a5d936 100644 --- a/minidump/minidump_thread_writer_test.cc +++ b/minidump/minidump_thread_writer_test.cc @@ -14,10 +14,6 @@ #include "minidump/minidump_thread_writer.h" -#include -#include -#include - #include #include @@ -26,12 +22,12 @@ #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "minidump/minidump_context_writer.h" -#include "minidump/minidump_memory_writer.h" #include "minidump/minidump_file_writer.h" +#include "minidump/minidump_memory_writer.h" #include "minidump/minidump_thread_id_map.h" #include "minidump/test/minidump_context_test_util.h" -#include "minidump/test/minidump_memory_writer_test_util.h" #include "minidump/test/minidump_file_writer_test_util.h" +#include "minidump/test/minidump_memory_writer_test_util.h" #include "minidump/test/minidump_writable_test_util.h" #include "snapshot/test/test_cpu_context.h" #include "snapshot/test/test_memory_snapshot.h" diff --git a/minidump/minidump_writable.h b/minidump/minidump_writable.h index 9e7cf71d..98273751 100644 --- a/minidump/minidump_writable.h +++ b/minidump/minidump_writable.h @@ -21,7 +21,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "util/file/file_io.h" namespace crashpad { diff --git a/minidump/minidump_writable_test.cc b/minidump/minidump_writable_test.cc index 38d97de3..be04e604 100644 --- a/minidump/minidump_writable_test.cc +++ b/minidump/minidump_writable_test.cc @@ -17,7 +17,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "util/file/string_file.h" diff --git a/minidump/minidump_writer_util.h b/minidump/minidump_writer_util.h index 3b2ab5e7..7ebe3f3a 100644 --- a/minidump/minidump_writer_util.h +++ b/minidump/minidump_writer_util.h @@ -21,7 +21,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" namespace crashpad { diff --git a/minidump/test/minidump_context_test_util.cc b/minidump/test/minidump_context_test_util.cc index a0e06400..730c2b79 100644 --- a/minidump/test/minidump_context_test_util.cc +++ b/minidump/test/minidump_context_test_util.cc @@ -14,8 +14,11 @@ #include "minidump/test/minidump_context_test_util.h" -#include "base/basictypes.h" +#include +#include + #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "snapshot/cpu_context.h" diff --git a/minidump/test/minidump_memory_writer_test_util.h b/minidump/test/minidump_memory_writer_test_util.h index f4b97675..5c56898c 100644 --- a/minidump/test/minidump_memory_writer_test_util.h +++ b/minidump/test/minidump_memory_writer_test_util.h @@ -20,10 +20,11 @@ #include #include #include +#include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "util/file/file_writer.h" namespace crashpad { diff --git a/minidump/test/minidump_rva_list_test_util.cc b/minidump/test/minidump_rva_list_test_util.cc index ebaa8f07..2ba5d024 100644 --- a/minidump/test/minidump_rva_list_test_util.cc +++ b/minidump/test/minidump_rva_list_test_util.cc @@ -16,6 +16,7 @@ #include #include +#include #include "minidump/minidump_extensions.h" #include "minidump/test/minidump_writable_test_util.h" diff --git a/minidump/test/minidump_string_writer_test_util.cc b/minidump/test/minidump_string_writer_test_util.cc index 6f5ff6b9..d5c73543 100644 --- a/minidump/test/minidump_string_writer_test_util.cc +++ b/minidump/test/minidump_string_writer_test_util.cc @@ -14,6 +14,8 @@ #include "minidump/test/minidump_string_writer_test_util.h" +#include + #include "gtest/gtest.h" #include "minidump/minidump_extensions.h" #include "minidump/test/minidump_writable_test_util.h" diff --git a/minidump/test/minidump_writable_test_util.h b/minidump/test/minidump_writable_test_util.h index f6190283..ea3ec003 100644 --- a/minidump/test/minidump_writable_test_util.h +++ b/minidump/test/minidump_writable_test_util.h @@ -22,7 +22,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_writable.h" diff --git a/snapshot/cpu_context.cc b/snapshot/cpu_context.cc index 1ff2b459..c11a031b 100644 --- a/snapshot/cpu_context.cc +++ b/snapshot/cpu_context.cc @@ -14,7 +14,6 @@ #include "snapshot/cpu_context.h" -#include "base/basictypes.h" #include "base/logging.h" #include "util/misc/implicit_cast.h" diff --git a/snapshot/cpu_context_test.cc b/snapshot/cpu_context_test.cc index a5f0b6aa..808ba615 100644 --- a/snapshot/cpu_context_test.cc +++ b/snapshot/cpu_context_test.cc @@ -14,10 +14,10 @@ #include "snapshot/cpu_context.h" -#include #include +#include -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" namespace crashpad { diff --git a/snapshot/crashpad_info_client_options.h b/snapshot/crashpad_info_client_options.h index 2d6c35ea..3f9e03da 100644 --- a/snapshot/crashpad_info_client_options.h +++ b/snapshot/crashpad_info_client_options.h @@ -15,6 +15,8 @@ #ifndef CRASHPAD_SNAPSHOT_CRASHPAD_INFO_CLIENT_OPTIONS_H_ #define CRASHPAD_SNAPSHOT_CRASHPAD_INFO_CLIENT_OPTIONS_H_ +#include + #include "util/misc/tri_state.h" namespace crashpad { diff --git a/snapshot/crashpad_info_client_options_test.cc b/snapshot/crashpad_info_client_options_test.cc index d57f1c14..9c1f88b5 100644 --- a/snapshot/crashpad_info_client_options_test.cc +++ b/snapshot/crashpad_info_client_options_test.cc @@ -15,6 +15,7 @@ #include "snapshot/crashpad_info_client_options.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "client/crashpad_info.h" diff --git a/snapshot/mac/exception_snapshot_mac.h b/snapshot/mac/exception_snapshot_mac.h index ea1161c3..325d9516 100644 --- a/snapshot/mac/exception_snapshot_mac.h +++ b/snapshot/mac/exception_snapshot_mac.h @@ -20,7 +20,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "snapshot/cpu_context.h" #include "snapshot/exception_snapshot.h" diff --git a/snapshot/mac/mach_o_image_annotations_reader.cc b/snapshot/mac/mach_o_image_annotations_reader.cc index 1e2b7404..b67a0898 100644 --- a/snapshot/mac/mach_o_image_annotations_reader.cc +++ b/snapshot/mac/mach_o_image_annotations_reader.cc @@ -16,6 +16,7 @@ #include #include +#include #include diff --git a/snapshot/mac/mach_o_image_annotations_reader.h b/snapshot/mac/mach_o_image_annotations_reader.h index f8fb1ec9..2ff6e0e4 100644 --- a/snapshot/mac/mach_o_image_annotations_reader.h +++ b/snapshot/mac/mach_o_image_annotations_reader.h @@ -19,7 +19,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/mac/process_types.h" namespace crashpad { diff --git a/snapshot/mac/mach_o_image_annotations_reader_test.cc b/snapshot/mac/mach_o_image_annotations_reader_test.cc index 32f3b5c0..18b00a95 100644 --- a/snapshot/mac/mach_o_image_annotations_reader_test.cc +++ b/snapshot/mac/mach_o_image_annotations_reader_test.cc @@ -19,14 +19,15 @@ #include #include #include +#include #include #include #include #include -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "client/crashpad_info.h" #include "client/simple_string_dictionary.h" #include "gtest/gtest.h" diff --git a/snapshot/mac/mach_o_image_reader.cc b/snapshot/mac/mach_o_image_reader.cc index 09b7ffeb..3e944f73 100644 --- a/snapshot/mac/mach_o_image_reader.cc +++ b/snapshot/mac/mach_o_image_reader.cc @@ -19,8 +19,8 @@ #include #include -#include #include +#include #include "base/logging.h" #include "base/strings/stringprintf.h" diff --git a/snapshot/mac/mach_o_image_reader.h b/snapshot/mac/mach_o_image_reader.h index 7047bc6a..883a756a 100644 --- a/snapshot/mac/mach_o_image_reader.h +++ b/snapshot/mac/mach_o_image_reader.h @@ -17,11 +17,12 @@ #include #include +#include #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "snapshot/mac/process_types.h" #include "util/misc/initialization_state_dcheck.h" diff --git a/snapshot/mac/mach_o_image_segment_reader.h b/snapshot/mac/mach_o_image_segment_reader.h index 4e6a97e3..20f891da 100644 --- a/snapshot/mac/mach_o_image_segment_reader.h +++ b/snapshot/mac/mach_o_image_segment_reader.h @@ -23,7 +23,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/mac/process_types.h" #include "util/misc/initialization_state_dcheck.h" diff --git a/snapshot/mac/mach_o_image_segment_reader_test.cc b/snapshot/mac/mach_o_image_segment_reader_test.cc index bf375af2..49eacb04 100644 --- a/snapshot/mac/mach_o_image_segment_reader_test.cc +++ b/snapshot/mac/mach_o_image_segment_reader_test.cc @@ -16,7 +16,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" diff --git a/snapshot/mac/mach_o_image_symbol_table_reader.cc b/snapshot/mac/mach_o_image_symbol_table_reader.cc index 949e4608..49655b69 100644 --- a/snapshot/mac/mach_o_image_symbol_table_reader.cc +++ b/snapshot/mac/mach_o_image_symbol_table_reader.cc @@ -16,6 +16,7 @@ #include #include +#include #include diff --git a/snapshot/mac/mach_o_image_symbol_table_reader.h b/snapshot/mac/mach_o_image_symbol_table_reader.h index 9302e7fc..a9867b05 100644 --- a/snapshot/mac/mach_o_image_symbol_table_reader.h +++ b/snapshot/mac/mach_o_image_symbol_table_reader.h @@ -15,14 +15,13 @@ #ifndef CRASHPAD_SNAPSHOT_MAC_MACH_O_IMAGE_SYMBOL_TABLE_READER_H_ #define CRASHPAD_SNAPSHOT_MAC_MACH_O_IMAGE_SYMBOL_TABLE_READER_H_ -#include "base/basictypes.h" - #include #include #include #include +#include "base/macros.h" #include "snapshot/mac/mach_o_image_segment_reader.h" #include "snapshot/mac/process_reader.h" #include "snapshot/mac/process_types.h" diff --git a/snapshot/mac/memory_snapshot_mac.h b/snapshot/mac/memory_snapshot_mac.h index 2f190824..dbb02ee7 100644 --- a/snapshot/mac/memory_snapshot_mac.h +++ b/snapshot/mac/memory_snapshot_mac.h @@ -18,7 +18,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/mac/process_reader.h" #include "snapshot/memory_snapshot.h" #include "util/misc/initialization_state_dcheck.h" diff --git a/snapshot/mac/module_snapshot_mac.h b/snapshot/mac/module_snapshot_mac.h index 42b14703..b1a232fd 100644 --- a/snapshot/mac/module_snapshot_mac.h +++ b/snapshot/mac/module_snapshot_mac.h @@ -22,7 +22,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "client/crashpad_info.h" #include "snapshot/crashpad_info_client_options.h" #include "snapshot/mac/process_reader.h" diff --git a/snapshot/mac/process_reader.h b/snapshot/mac/process_reader.h index a781667f..13c59da7 100644 --- a/snapshot/mac/process_reader.h +++ b/snapshot/mac/process_reader.h @@ -16,6 +16,7 @@ #define CRASHPAD_SNAPSHOT_MAC_PROCESS_READER_H_ #include +#include #include #include #include @@ -23,7 +24,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" #include "util/mach/task_memory.h" diff --git a/snapshot/mac/process_snapshot_mac.h b/snapshot/mac/process_snapshot_mac.h index dd5b9c3a..92c73763 100644 --- a/snapshot/mac/process_snapshot_mac.h +++ b/snapshot/mac/process_snapshot_mac.h @@ -23,7 +23,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "client/crashpad_info.h" #include "snapshot/crashpad_info_client_options.h" diff --git a/snapshot/mac/process_types.cc b/snapshot/mac/process_types.cc index 0fc14f0e..dd105495 100644 --- a/snapshot/mac/process_types.cc +++ b/snapshot/mac/process_types.cc @@ -17,6 +17,7 @@ #include #include +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "snapshot/mac/process_types/internal.h" #include "util/mach/task_memory.h" diff --git a/snapshot/mac/process_types/custom.cc b/snapshot/mac/process_types/custom.cc index 6d6fd0db..78bc302d 100644 --- a/snapshot/mac/process_types/custom.cc +++ b/snapshot/mac/process_types/custom.cc @@ -15,6 +15,7 @@ #include "snapshot/mac/process_types.h" #include +#include #include "base/logging.h" #include "snapshot/mac/process_types/internal.h" diff --git a/snapshot/mac/process_types_test.cc b/snapshot/mac/process_types_test.cc index 7252c5c3..d54ea3c4 100644 --- a/snapshot/mac/process_types_test.cc +++ b/snapshot/mac/process_types_test.cc @@ -20,8 +20,9 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "gtest/gtest.h" #include "test/mac/dyld.h" #include "util/mac/mac_util.h" diff --git a/snapshot/mac/system_snapshot_mac.h b/snapshot/mac/system_snapshot_mac.h index edbd74fb..0f18a48d 100644 --- a/snapshot/mac/system_snapshot_mac.h +++ b/snapshot/mac/system_snapshot_mac.h @@ -19,7 +19,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/system_snapshot.h" #include "util/misc/initialization_state_dcheck.h" diff --git a/snapshot/mac/thread_snapshot_mac.h b/snapshot/mac/thread_snapshot_mac.h index 35b77bba..bbb7f77b 100644 --- a/snapshot/mac/thread_snapshot_mac.h +++ b/snapshot/mac/thread_snapshot_mac.h @@ -18,7 +18,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "snapshot/cpu_context.h" #include "snapshot/mac/memory_snapshot_mac.h" diff --git a/snapshot/minidump/minidump_simple_string_dictionary_reader.cc b/snapshot/minidump/minidump_simple_string_dictionary_reader.cc index 0d8301c1..7e263f9e 100644 --- a/snapshot/minidump/minidump_simple_string_dictionary_reader.cc +++ b/snapshot/minidump/minidump_simple_string_dictionary_reader.cc @@ -14,8 +14,10 @@ #include "snapshot/minidump/minidump_simple_string_dictionary_reader.h" -#include +#include + #include +#include #include "base/logging.h" #include "minidump/minidump_extensions.h" diff --git a/snapshot/minidump/minidump_string_list_reader.cc b/snapshot/minidump/minidump_string_list_reader.cc index 9ca6ef02..3b9bd6b5 100644 --- a/snapshot/minidump/minidump_string_list_reader.cc +++ b/snapshot/minidump/minidump_string_list_reader.cc @@ -14,6 +14,8 @@ #include "snapshot/minidump/minidump_string_list_reader.h" +#include + #include "base/logging.h" #include "minidump/minidump_extensions.h" #include "snapshot/minidump/minidump_string_reader.h" diff --git a/snapshot/minidump/minidump_string_reader.cc b/snapshot/minidump/minidump_string_reader.cc index 6ea36089..4a5cb136 100644 --- a/snapshot/minidump/minidump_string_reader.cc +++ b/snapshot/minidump/minidump_string_reader.cc @@ -14,6 +14,8 @@ #include "snapshot/minidump/minidump_string_reader.h" +#include + #include "base/logging.h" #include "minidump/minidump_extensions.h" diff --git a/snapshot/minidump/module_snapshot_minidump.h b/snapshot/minidump/module_snapshot_minidump.h index bf933663..b9b7d559 100644 --- a/snapshot/minidump/module_snapshot_minidump.h +++ b/snapshot/minidump/module_snapshot_minidump.h @@ -24,7 +24,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/module_snapshot.h" #include "util/file/file_reader.h" #include "util/misc/initialization_state_dcheck.h" diff --git a/snapshot/minidump/process_snapshot_minidump.h b/snapshot/minidump/process_snapshot_minidump.h index 9384eaff..ad1af3e8 100644 --- a/snapshot/minidump/process_snapshot_minidump.h +++ b/snapshot/minidump/process_snapshot_minidump.h @@ -15,19 +15,20 @@ #ifndef CRASHPAD_SNAPSHOT_MINIDUMP_PROCESS_SNAPSHOT_MINIDUMP_H_ #define CRASHPAD_SNAPSHOT_MINIDUMP_PROCESS_SNAPSHOT_MINIDUMP_H_ -#include #include #include +#include +#include #include #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "minidump/minidump_extensions.h" #include "snapshot/exception_snapshot.h" -#include "snapshot/minidump/module_snapshot_minidump.h" #include "snapshot/memory_snapshot.h" +#include "snapshot/minidump/module_snapshot_minidump.h" #include "snapshot/module_snapshot.h" #include "snapshot/process_snapshot.h" #include "snapshot/system_snapshot.h" diff --git a/snapshot/minidump/process_snapshot_minidump_test.cc b/snapshot/minidump/process_snapshot_minidump_test.cc index 8eb7349b..07665ca6 100644 --- a/snapshot/minidump/process_snapshot_minidump_test.cc +++ b/snapshot/minidump/process_snapshot_minidump_test.cc @@ -14,9 +14,9 @@ #include "snapshot/minidump/process_snapshot_minidump.h" -#include #include #include +#include #include "base/memory/scoped_ptr.h" #include "gtest/gtest.h" diff --git a/snapshot/test/test_cpu_context.cc b/snapshot/test/test_cpu_context.cc index a66d3933..a7506b87 100644 --- a/snapshot/test/test_cpu_context.cc +++ b/snapshot/test/test_cpu_context.cc @@ -14,7 +14,10 @@ #include "snapshot/test/test_cpu_context.h" -#include "base/basictypes.h" +#include +#include + +#include "base/macros.h" namespace crashpad { namespace test { diff --git a/snapshot/test/test_exception_snapshot.h b/snapshot/test/test_exception_snapshot.h index 291f6c14..a17f3dc1 100644 --- a/snapshot/test/test_exception_snapshot.h +++ b/snapshot/test/test_exception_snapshot.h @@ -19,7 +19,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/cpu_context.h" #include "snapshot/exception_snapshot.h" diff --git a/snapshot/test/test_memory_map_region_snapshot.h b/snapshot/test/test_memory_map_region_snapshot.h index e9edc5ca..0a768885 100644 --- a/snapshot/test/test_memory_map_region_snapshot.h +++ b/snapshot/test/test_memory_map_region_snapshot.h @@ -17,7 +17,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/memory_map_region_snapshot.h" namespace crashpad { diff --git a/snapshot/test/test_memory_snapshot.h b/snapshot/test/test_memory_snapshot.h index 31faea43..80b45c66 100644 --- a/snapshot/test/test_memory_snapshot.h +++ b/snapshot/test/test_memory_snapshot.h @@ -18,7 +18,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/memory_snapshot.h" namespace crashpad { diff --git a/snapshot/test/test_module_snapshot.h b/snapshot/test/test_module_snapshot.h index 85a5622e..ff9bdbd5 100644 --- a/snapshot/test/test_module_snapshot.h +++ b/snapshot/test/test_module_snapshot.h @@ -22,7 +22,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/module_snapshot.h" namespace crashpad { diff --git a/snapshot/test/test_process_snapshot.h b/snapshot/test/test_process_snapshot.h index 6e81354f..f771944e 100644 --- a/snapshot/test/test_process_snapshot.h +++ b/snapshot/test/test_process_snapshot.h @@ -24,7 +24,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "snapshot/exception_snapshot.h" #include "snapshot/memory_map_region_snapshot.h" diff --git a/snapshot/test/test_system_snapshot.h b/snapshot/test/test_system_snapshot.h index d626fae8..31787eba 100644 --- a/snapshot/test/test_system_snapshot.h +++ b/snapshot/test/test_system_snapshot.h @@ -19,7 +19,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/system_snapshot.h" namespace crashpad { diff --git a/snapshot/test/test_thread_snapshot.h b/snapshot/test/test_thread_snapshot.h index 29e3f5fb..1fe13281 100644 --- a/snapshot/test/test_thread_snapshot.h +++ b/snapshot/test/test_thread_snapshot.h @@ -20,7 +20,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "snapshot/cpu_context.h" #include "snapshot/memory_snapshot.h" diff --git a/snapshot/win/cpu_context_win.cc b/snapshot/win/cpu_context_win.cc index d4ce66da..2450ef25 100644 --- a/snapshot/win/cpu_context_win.cc +++ b/snapshot/win/cpu_context_win.cc @@ -14,6 +14,7 @@ #include "snapshot/win/cpu_context_win.h" +#include #include #include "base/logging.h" diff --git a/snapshot/win/exception_snapshot_win.h b/snapshot/win/exception_snapshot_win.h index 1688b125..63d5bbfe 100644 --- a/snapshot/win/exception_snapshot_win.h +++ b/snapshot/win/exception_snapshot_win.h @@ -15,10 +15,10 @@ #ifndef CRASHPAD_SNAPSHOT_WIN_EXCEPTION_SNAPSHOT_WIN_H_ #define CRASHPAD_SNAPSHOT_WIN_EXCEPTION_SNAPSHOT_WIN_H_ -#include #include +#include -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "snapshot/cpu_context.h" #include "snapshot/exception_snapshot.h" diff --git a/snapshot/win/memory_snapshot_win.h b/snapshot/win/memory_snapshot_win.h index b6d2074e..04d11842 100644 --- a/snapshot/win/memory_snapshot_win.h +++ b/snapshot/win/memory_snapshot_win.h @@ -18,7 +18,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/memory_snapshot.h" #include "snapshot/win/process_reader_win.h" #include "util/misc/initialization_state_dcheck.h" diff --git a/snapshot/win/module_snapshot_win.h b/snapshot/win/module_snapshot_win.h index 92e5913c..99327de5 100644 --- a/snapshot/win/module_snapshot_win.h +++ b/snapshot/win/module_snapshot_win.h @@ -15,15 +15,14 @@ #ifndef CRASHPAD_SNAPSHOT_WIN_MODULE_SNAPSHOT_WIN_H_ #define CRASHPAD_SNAPSHOT_WIN_MODULE_SNAPSHOT_WIN_H_ -#include -#include #include +#include #include #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "snapshot/crashpad_info_client_options.h" #include "snapshot/module_snapshot.h" diff --git a/snapshot/win/pe_image_annotations_reader.cc b/snapshot/win/pe_image_annotations_reader.cc index f2d14547..87de1e33 100644 --- a/snapshot/win/pe_image_annotations_reader.cc +++ b/snapshot/win/pe_image_annotations_reader.cc @@ -15,6 +15,7 @@ #include "snapshot/win/pe_image_annotations_reader.h" #include +#include #include "base/strings/utf_string_conversions.h" #include "client/simple_string_dictionary.h" diff --git a/snapshot/win/pe_image_annotations_reader.h b/snapshot/win/pe_image_annotations_reader.h index 3409ac88..868b076c 100644 --- a/snapshot/win/pe_image_annotations_reader.h +++ b/snapshot/win/pe_image_annotations_reader.h @@ -19,7 +19,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad { diff --git a/snapshot/win/pe_image_annotations_reader_test.cc b/snapshot/win/pe_image_annotations_reader_test.cc index a37ac1ef..9bdf1245 100644 --- a/snapshot/win/pe_image_annotations_reader_test.cc +++ b/snapshot/win/pe_image_annotations_reader_test.cc @@ -21,9 +21,9 @@ #include #include -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "client/crashpad_info.h" #include "client/simple_string_dictionary.h" #include "gtest/gtest.h" diff --git a/snapshot/win/pe_image_reader.h b/snapshot/win/pe_image_reader.h index 87e3a8f4..4e9516b2 100644 --- a/snapshot/win/pe_image_reader.h +++ b/snapshot/win/pe_image_reader.h @@ -16,10 +16,12 @@ #define CRASHPAD_SNAPSHOT_WIN_PE_IMAGE_READER_H_ #include +#include +#include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/win/process_subrange_reader.h" #include "util/misc/initialization_state_dcheck.h" #include "util/misc/uuid.h" diff --git a/snapshot/win/pe_image_resource_reader.h b/snapshot/win/pe_image_resource_reader.h index 59a6d954..ce339dd2 100644 --- a/snapshot/win/pe_image_resource_reader.h +++ b/snapshot/win/pe_image_resource_reader.h @@ -15,12 +15,12 @@ #ifndef CRASHPAD_SNAPSHOT_WIN_PE_IMAGE_RESOURCE_READER_H_ #define CRASHPAD_SNAPSHOT_WIN_PE_IMAGE_RESOURCE_READER_H_ -#include #include +#include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/win/process_subrange_reader.h" #include "util/misc/initialization_state_dcheck.h" #include "util/win/address_types.h" diff --git a/snapshot/win/process_reader_win.cc b/snapshot/win/process_reader_win.cc index f3b63237..91d236c4 100644 --- a/snapshot/win/process_reader_win.cc +++ b/snapshot/win/process_reader_win.cc @@ -14,6 +14,7 @@ #include "snapshot/win/process_reader_win.h" +#include #include #include "base/memory/scoped_ptr.h" diff --git a/snapshot/win/process_reader_win.h b/snapshot/win/process_reader_win.h index 90a115d5..e2f1b01a 100644 --- a/snapshot/win/process_reader_win.h +++ b/snapshot/win/process_reader_win.h @@ -15,11 +15,12 @@ #ifndef CRASHPAD_SNAPSHOT_WIN_PROCESS_READER_WIN_H_ #define CRASHPAD_SNAPSHOT_WIN_PROCESS_READER_WIN_H_ -#include #include +#include #include +#include "base/macros.h" #include "build/build_config.h" #include "util/misc/initialization_state_dcheck.h" #include "util/win/address_types.h" diff --git a/snapshot/win/process_reader_win_test.cc b/snapshot/win/process_reader_win_test.cc index 2c4660e2..b9befc9a 100644 --- a/snapshot/win/process_reader_win_test.cc +++ b/snapshot/win/process_reader_win_test.cc @@ -14,8 +14,8 @@ #include "snapshot/win/process_reader_win.h" -#include #include +#include #include "gtest/gtest.h" #include "test/win/win_multiprocess.h" diff --git a/snapshot/win/process_snapshot_win.h b/snapshot/win/process_snapshot_win.h index a1dd7233..64e73da1 100644 --- a/snapshot/win/process_snapshot_win.h +++ b/snapshot/win/process_snapshot_win.h @@ -17,12 +17,13 @@ #include #include +#include #include #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "client/crashpad_info.h" #include "snapshot/crashpad_info_client_options.h" @@ -41,9 +42,9 @@ #include "snapshot/win/thread_snapshot_win.h" #include "util/misc/initialization_state_dcheck.h" #include "util/misc/uuid.h" +#include "util/stdlib/pointer_container.h" #include "util/win/address_types.h" #include "util/win/process_structs.h" -#include "util/stdlib/pointer_container.h" namespace crashpad { diff --git a/snapshot/win/process_snapshot_win_test.cc b/snapshot/win/process_snapshot_win_test.cc index 0c4c3436..dc253bd2 100644 --- a/snapshot/win/process_snapshot_win_test.cc +++ b/snapshot/win/process_snapshot_win_test.cc @@ -15,15 +15,16 @@ #include "snapshot/win/process_snapshot_win.h" #include "base/files/file_path.h" +#include "build/build_config.h" #include "gtest/gtest.h" #include "snapshot/win/module_snapshot_win.h" #include "snapshot/win/pe_image_reader.h" #include "snapshot/win/process_reader_win.h" +#include "test/paths.h" +#include "test/win/child_launcher.h" #include "util/file/file_io.h" #include "util/win/scoped_handle.h" #include "util/win/scoped_process_suspend.h" -#include "test/paths.h" -#include "test/win/child_launcher.h" namespace crashpad { namespace test { diff --git a/snapshot/win/process_subrange_reader.h b/snapshot/win/process_subrange_reader.h index e8da592c..f6af00ed 100644 --- a/snapshot/win/process_subrange_reader.h +++ b/snapshot/win/process_subrange_reader.h @@ -17,7 +17,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "util/misc/initialization_state_dcheck.h" #include "util/win/address_types.h" #include "util/win/checked_win_address_range.h" diff --git a/snapshot/win/system_snapshot_win.cc b/snapshot/win/system_snapshot_win.cc index a62bf5ac..28d692bd 100644 --- a/snapshot/win/system_snapshot_win.cc +++ b/snapshot/win/system_snapshot_win.cc @@ -14,9 +14,9 @@ #include "snapshot/win/system_snapshot_win.h" +#include #include #include -#include #include #include diff --git a/snapshot/win/system_snapshot_win.h b/snapshot/win/system_snapshot_win.h index b7a22c6a..fc209a5f 100644 --- a/snapshot/win/system_snapshot_win.h +++ b/snapshot/win/system_snapshot_win.h @@ -20,7 +20,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/system_snapshot.h" #include "snapshot/win/process_reader_win.h" #include "util/misc/initialization_state_dcheck.h" diff --git a/snapshot/win/thread_snapshot_win.h b/snapshot/win/thread_snapshot_win.h index 3f283a18..0e07110e 100644 --- a/snapshot/win/thread_snapshot_win.h +++ b/snapshot/win/thread_snapshot_win.h @@ -19,7 +19,8 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" +#include "build/build_config.h" #include "snapshot/cpu_context.h" #include "snapshot/memory_snapshot.h" #include "snapshot/thread_snapshot.h" diff --git a/test/file.cc b/test/file.cc index 9c007433..cd53b1bb 100644 --- a/test/file.cc +++ b/test/file.cc @@ -17,6 +17,7 @@ #include #include +#include "build/build_config.h" #include "gtest/gtest.h" #include "test/errors.h" diff --git a/test/mac/mach_multiprocess.h b/test/mac/mach_multiprocess.h index 18324d42..0e3a8c42 100644 --- a/test/mac/mach_multiprocess.h +++ b/test/mac/mach_multiprocess.h @@ -18,7 +18,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "test/multiprocess.h" namespace crashpad { diff --git a/test/mac/mach_multiprocess_test.cc b/test/mac/mach_multiprocess_test.cc index 858821f7..ef395591 100644 --- a/test/mac/mach_multiprocess_test.cc +++ b/test/mac/mach_multiprocess_test.cc @@ -16,7 +16,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" namespace crashpad { diff --git a/test/multiprocess.h b/test/multiprocess.h index bbfbca31..a7ef6898 100644 --- a/test/multiprocess.h +++ b/test/multiprocess.h @@ -17,7 +17,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "util/file/file_io.h" diff --git a/test/multiprocess_exec.h b/test/multiprocess_exec.h index 2d8f3389..9b2ffc1c 100644 --- a/test/multiprocess_exec.h +++ b/test/multiprocess_exec.h @@ -18,7 +18,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "test/multiprocess.h" diff --git a/test/multiprocess_exec_test.cc b/test/multiprocess_exec_test.cc index dc916404..f6231e9c 100644 --- a/test/multiprocess_exec_test.cc +++ b/test/multiprocess_exec_test.cc @@ -14,7 +14,7 @@ #include "test/multiprocess_exec.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "gtest/gtest.h" diff --git a/test/multiprocess_exec_win.cc b/test/multiprocess_exec_win.cc index 2a58f846..3f7d2fac 100644 --- a/test/multiprocess_exec_win.cc +++ b/test/multiprocess_exec_win.cc @@ -14,6 +14,8 @@ #include "test/multiprocess_exec.h" +#include + #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "gtest/gtest.h" diff --git a/test/multiprocess_posix_test.cc b/test/multiprocess_posix_test.cc index 87a42385..191bdeff 100644 --- a/test/multiprocess_posix_test.cc +++ b/test/multiprocess_posix_test.cc @@ -18,7 +18,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "test/gtest_death_check.h" #include "util/file/file_io.h" diff --git a/test/paths.h b/test/paths.h index c1431696..7643ddd8 100644 --- a/test/paths.h +++ b/test/paths.h @@ -15,8 +15,8 @@ #ifndef CRASHPAD_TEST_PATHS_H_ #define CRASHPAD_TEST_PATHS_H_ -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" namespace crashpad { namespace test { diff --git a/test/scoped_temp_dir.h b/test/scoped_temp_dir.h index 781975cd..5e937e75 100644 --- a/test/scoped_temp_dir.h +++ b/test/scoped_temp_dir.h @@ -15,8 +15,8 @@ #ifndef CRASHPAD_TEST_SCOPED_TEMP_DIR_ #define CRASHPAD_TEST_SCOPED_TEMP_DIR_ -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" namespace crashpad { namespace test { diff --git a/test/win/win_child_process.h b/test/win/win_child_process.h index 6ca6eca3..6b8fed19 100644 --- a/test/win/win_child_process.h +++ b/test/win/win_child_process.h @@ -15,7 +15,7 @@ #ifndef CRASHPAD_TEST_WIN_WIN_CHILD_PROCESS_H_ #define CRASHPAD_TEST_WIN_WIN_CHILD_PROCESS_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "util/file/file_io.h" #include "util/win/scoped_handle.h" diff --git a/test/win/win_child_process_test.cc b/test/win/win_child_process_test.cc index e191dcc9..75275353 100644 --- a/test/win/win_child_process_test.cc +++ b/test/win/win_child_process_test.cc @@ -14,10 +14,10 @@ #include "test/win/win_child_process.h" -#include #include +#include -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" namespace crashpad { diff --git a/test/win/win_multiprocess.h b/test/win/win_multiprocess.h index 906fa5dd..1e83a582 100644 --- a/test/win/win_multiprocess.h +++ b/test/win/win_multiprocess.h @@ -17,7 +17,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "test/win/win_child_process.h" #include "util/file/file_io.h" diff --git a/test/win/win_multiprocess_test.cc b/test/win/win_multiprocess_test.cc index 19af08e9..e1a315e2 100644 --- a/test/win/win_multiprocess_test.cc +++ b/test/win/win_multiprocess_test.cc @@ -14,7 +14,7 @@ #include "test/win/win_multiprocess.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" namespace crashpad { diff --git a/tools/crashpad_database_util.cc b/tools/crashpad_database_util.cc index a1ad52b5..3cd573a8 100644 --- a/tools/crashpad_database_util.cc +++ b/tools/crashpad_database_util.cc @@ -25,9 +25,9 @@ #include #include -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/numerics/safe_conversions.h" #include "base/strings/utf_string_conversions.h" diff --git a/tools/mac/catch_exception_tool.cc b/tools/mac/catch_exception_tool.cc index 32c6aed2..afd738a4 100644 --- a/tools/mac/catch_exception_tool.cc +++ b/tools/mac/catch_exception_tool.cc @@ -16,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/tools/mac/exception_port_tool.cc b/tools/mac/exception_port_tool.cc index b873e68b..3faa00fe 100644 --- a/tools/mac/exception_port_tool.cc +++ b/tools/mac/exception_port_tool.cc @@ -19,14 +19,15 @@ #include #include #include +#include #include #include #include -#include "base/basictypes.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "tools/tool_support.h" #include "util/mach/exception_ports.h" diff --git a/tools/tool_support.h b/tools/tool_support.h index 9099691a..79dc7524 100644 --- a/tools/tool_support.h +++ b/tools/tool_support.h @@ -17,8 +17,8 @@ #include -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/strings/string_piece.h" #include "build/build_config.h" diff --git a/util/file/file_io_test.cc b/util/file/file_io_test.cc index 77529ea5..27ffd310 100644 --- a/util/file/file_io_test.cc +++ b/util/file/file_io_test.cc @@ -15,8 +15,8 @@ #include "util/file/file_io.h" #include "base/atomicops.h" -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "test/errors.h" #include "test/file.h" diff --git a/util/file/file_reader.h b/util/file/file_reader.h index 5d77b875..39225e54 100644 --- a/util/file/file_reader.h +++ b/util/file/file_reader.h @@ -18,8 +18,8 @@ #include #include -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "util/file/file_io.h" #include "util/file/file_seeker.h" diff --git a/util/file/file_writer.cc b/util/file/file_writer.cc index 00a323e5..edbdb8d5 100644 --- a/util/file/file_writer.cc +++ b/util/file/file_writer.cc @@ -14,9 +14,10 @@ #include "util/file/file_writer.h" -#include - #include +#include + +#include #include "base/logging.h" #include "base/numerics/safe_conversions.h" diff --git a/util/file/file_writer.h b/util/file/file_writer.h index a0d547e8..ed261ec5 100644 --- a/util/file/file_writer.h +++ b/util/file/file_writer.h @@ -19,8 +19,8 @@ #include -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "util/file/file_io.h" #include "util/file/file_seeker.h" diff --git a/util/file/string_file.h b/util/file/string_file.h index 05f57072..313310e6 100644 --- a/util/file/string_file.h +++ b/util/file/string_file.h @@ -19,7 +19,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/numerics/safe_math.h" #include "util/file/file_io.h" #include "util/file/file_reader.h" diff --git a/util/file/string_file_test.cc b/util/file/string_file_test.cc index 0990daf0..1b154bb9 100644 --- a/util/file/string_file_test.cc +++ b/util/file/string_file_test.cc @@ -14,6 +14,7 @@ #include "util/file/string_file.h" +#include #include #include diff --git a/util/mac/checked_mach_address_range_test.cc b/util/mac/checked_mach_address_range_test.cc index 702715d0..c0126240 100644 --- a/util/mac/checked_mach_address_range_test.cc +++ b/util/mac/checked_mach_address_range_test.cc @@ -15,10 +15,11 @@ #include "util/mac/checked_mach_address_range.h" #include +#include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "gtest/gtest.h" diff --git a/util/mac/launchd.h b/util/mac/launchd.h index 03f8bf09..25450752 100644 --- a/util/mac/launchd.h +++ b/util/mac/launchd.h @@ -17,6 +17,7 @@ #include #include +#include namespace crashpad { diff --git a/util/mac/launchd_test.mm b/util/mac/launchd_test.mm index 8f60fc91..0cfd03a5 100644 --- a/util/mac/launchd_test.mm +++ b/util/mac/launchd_test.mm @@ -16,13 +16,14 @@ #import #include +#include #include #include #include -#include "base/basictypes.h" #include "base/mac/scoped_launch_data.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "util/stdlib/objc.h" diff --git a/util/mac/xattr.cc b/util/mac/xattr.cc index cb72e06e..36dfda83 100644 --- a/util/mac/xattr.cc +++ b/util/mac/xattr.cc @@ -16,13 +16,14 @@ #include #include +#include #include -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/numerics/safe_conversions.h" -#include "base/strings/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" namespace crashpad { diff --git a/util/mach/child_port_handshake.cc b/util/mach/child_port_handshake.cc index a7b6e57c..51aad905 100644 --- a/util/mach/child_port_handshake.cc +++ b/util/mach/child_port_handshake.cc @@ -16,6 +16,7 @@ #include #include +#include #include #include #include diff --git a/util/mach/child_port_handshake.h b/util/mach/child_port_handshake.h index 666f59b1..50de118a 100644 --- a/util/mach/child_port_handshake.h +++ b/util/mach/child_port_handshake.h @@ -19,8 +19,8 @@ #include -#include "base/basictypes.h" #include "base/files/scoped_file.h" +#include "base/macros.h" #include "util/mach/child_port_types.h" namespace crashpad { diff --git a/util/mach/child_port_server.h b/util/mach/child_port_server.h index bc42cc09..b82e99a3 100644 --- a/util/mach/child_port_server.h +++ b/util/mach/child_port_server.h @@ -19,7 +19,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "util/mach/child_port_types.h" #include "util/mach/mach_message_server.h" diff --git a/util/mach/composite_mach_message_server.h b/util/mach/composite_mach_message_server.h index 6da957b7..fe3446e0 100644 --- a/util/mach/composite_mach_message_server.h +++ b/util/mach/composite_mach_message_server.h @@ -20,7 +20,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "util/mach/mach_message_server.h" namespace crashpad { diff --git a/util/mach/composite_mach_message_server_test.cc b/util/mach/composite_mach_message_server_test.cc index 0af82067..11984da9 100644 --- a/util/mach/composite_mach_message_server_test.cc +++ b/util/mach/composite_mach_message_server_test.cc @@ -14,6 +14,8 @@ #include "util/mach/composite_mach_message_server.h" +#include + #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "test/gtest_death_check.h" diff --git a/util/mach/exc_client_variants.cc b/util/mach/exc_client_variants.cc index 2495a60b..e7945b22 100644 --- a/util/mach/exc_client_variants.cc +++ b/util/mach/exc_client_variants.cc @@ -14,6 +14,8 @@ #include "util/mach/exc_client_variants.h" +#include + #include #include "base/logging.h" diff --git a/util/mach/exc_client_variants_test.cc b/util/mach/exc_client_variants_test.cc index 49bf78c3..ca3101cd 100644 --- a/util/mach/exc_client_variants_test.cc +++ b/util/mach/exc_client_variants_test.cc @@ -17,8 +17,9 @@ #include #include #include +#include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h" diff --git a/util/mach/exc_server_variants.cc b/util/mach/exc_server_variants.cc index c5a74a3b..209c45ef 100644 --- a/util/mach/exc_server_variants.cc +++ b/util/mach/exc_server_variants.cc @@ -24,8 +24,8 @@ #include "util/mac/mac_util.h" #include "util/mach/composite_mach_message_server.h" #include "util/mach/exc.h" -#include "util/mach/exception_behaviors.h" #include "util/mach/excServer.h" +#include "util/mach/exception_behaviors.h" #include "util/mach/mach_exc.h" #include "util/mach/mach_excServer.h" #include "util/mach/mach_message.h" diff --git a/util/mach/exc_server_variants.h b/util/mach/exc_server_variants.h index 95d1c12d..c80233cc 100644 --- a/util/mach/exc_server_variants.h +++ b/util/mach/exc_server_variants.h @@ -19,7 +19,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "util/mach/mach_extensions.h" #include "util/mach/mach_message_server.h" diff --git a/util/mach/exc_server_variants_test.cc b/util/mach/exc_server_variants_test.cc index 68674b67..1a24e698 100644 --- a/util/mach/exc_server_variants_test.cc +++ b/util/mach/exc_server_variants_test.cc @@ -15,9 +15,12 @@ #include "util/mach/exc_server_variants.h" #include +#include #include +#include #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h" diff --git a/util/mach/exception_behaviors_test.cc b/util/mach/exception_behaviors_test.cc index cbde600a..a4a55e26 100644 --- a/util/mach/exception_behaviors_test.cc +++ b/util/mach/exception_behaviors_test.cc @@ -14,7 +14,9 @@ #include "util/mach/exception_behaviors.h" -#include "base/basictypes.h" +#include + +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "util/mach/mach_extensions.h" diff --git a/util/mach/exception_ports.h b/util/mach/exception_ports.h index 7f23c5e5..b2473d98 100644 --- a/util/mach/exception_ports.h +++ b/util/mach/exception_ports.h @@ -19,7 +19,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad { diff --git a/util/mach/exception_ports_test.cc b/util/mach/exception_ports_test.cc index e6e1d56d..37c7d118 100644 --- a/util/mach/exception_ports_test.cc +++ b/util/mach/exception_ports_test.cc @@ -19,10 +19,10 @@ #include #include -#include "base/basictypes.h" #include "base/logging.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h" diff --git a/util/mach/exception_types_test.cc b/util/mach/exception_types_test.cc index 0520c2e0..372b57f0 100644 --- a/util/mach/exception_types_test.cc +++ b/util/mach/exception_types_test.cc @@ -16,10 +16,11 @@ #include #include +#include #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "util/mac/mac_util.h" diff --git a/util/mach/mach_message_server.h b/util/mach/mach_message_server.h index 484ee8bb..9793560e 100644 --- a/util/mach/mach_message_server.h +++ b/util/mach/mach_message_server.h @@ -19,7 +19,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad { diff --git a/util/mach/mach_message_server_test.cc b/util/mach/mach_message_server_test.cc index a59554b3..fc45e262 100644 --- a/util/mach/mach_message_server_test.cc +++ b/util/mach/mach_message_server_test.cc @@ -15,12 +15,14 @@ #include "util/mach/mach_message_server.h" #include +#include #include +#include #include -#include "base/basictypes.h" #include "base/mac/scoped_mach_port.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h" #include "test/mac/mach_multiprocess.h" diff --git a/util/mach/mach_message_test.cc b/util/mach/mach_message_test.cc index d77f0dd3..3e64601a 100644 --- a/util/mach/mach_message_test.cc +++ b/util/mach/mach_message_test.cc @@ -16,7 +16,6 @@ #include -#include "base/basictypes.h" #include "base/mac/scoped_mach_port.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h" diff --git a/util/mach/notify_server.cc b/util/mach/notify_server.cc index 48a4a9e9..9ac377d1 100644 --- a/util/mach/notify_server.cc +++ b/util/mach/notify_server.cc @@ -15,8 +15,8 @@ #include "util/mach/notify_server.h" #include "base/logging.h" -#include "util/mach/notifyServer.h" #include "util/mach/mach_message.h" +#include "util/mach/notifyServer.h" extern "C" { diff --git a/util/mach/notify_server.h b/util/mach/notify_server.h index ce33b21b..ad0a8882 100644 --- a/util/mach/notify_server.h +++ b/util/mach/notify_server.h @@ -19,7 +19,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "util/mach/mach_message_server.h" namespace crashpad { diff --git a/util/mach/scoped_task_suspend.h b/util/mach/scoped_task_suspend.h index 4b90aba0..389ea5f6 100644 --- a/util/mach/scoped_task_suspend.h +++ b/util/mach/scoped_task_suspend.h @@ -17,7 +17,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad { diff --git a/util/mach/symbolic_constants_mach.cc b/util/mach/symbolic_constants_mach.cc index fc86b1f6..26cc564f 100644 --- a/util/mach/symbolic_constants_mach.cc +++ b/util/mach/symbolic_constants_mach.cc @@ -15,8 +15,9 @@ #include "util/mach/symbolic_constants_mach.h" #include +#include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "util/mach/exception_behaviors.h" #include "util/mach/mach_extensions.h" diff --git a/util/mach/symbolic_constants_mach_test.cc b/util/mach/symbolic_constants_mach_test.cc index 5f3d7d9b..feb409bf 100644 --- a/util/mach/symbolic_constants_mach_test.cc +++ b/util/mach/symbolic_constants_mach_test.cc @@ -16,8 +16,9 @@ #include #include +#include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" diff --git a/util/mach/task_for_pid.cc b/util/mach/task_for_pid.cc index 1f238b19..39ac2f96 100644 --- a/util/mach/task_for_pid.cc +++ b/util/mach/task_for_pid.cc @@ -21,7 +21,6 @@ #include #include -#include "base/basictypes.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" #include "util/posix/process_info.h" diff --git a/util/mach/task_memory.h b/util/mach/task_memory.h index 2077d5ea..086b0b99 100644 --- a/util/mach/task_memory.h +++ b/util/mach/task_memory.h @@ -16,11 +16,12 @@ #define CRASHPAD_UTIL_MACH_TASK_MEMORY_H_ #include +#include #include -#include "base/basictypes.h" #include "base/mac/scoped_mach_vm.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace crashpad { diff --git a/util/misc/clock_test.cc b/util/misc/clock_test.cc index 82ca85fa..c6e2c02a 100644 --- a/util/misc/clock_test.cc +++ b/util/misc/clock_test.cc @@ -15,11 +15,12 @@ #include "util/misc/clock.h" #include +#include #include -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" diff --git a/util/misc/clock_win.cc b/util/misc/clock_win.cc index 7231205d..2de7ae75 100644 --- a/util/misc/clock_win.cc +++ b/util/misc/clock_win.cc @@ -14,8 +14,8 @@ #include "util/misc/clock.h" -#include #include +#include namespace { diff --git a/util/misc/initialization_state.h b/util/misc/initialization_state.h index b0496e5c..85f9b289 100644 --- a/util/misc/initialization_state.h +++ b/util/misc/initialization_state.h @@ -17,7 +17,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad { diff --git a/util/misc/initialization_state_dcheck.h b/util/misc/initialization_state_dcheck.h index 24b3d077..e45a6f82 100644 --- a/util/misc/initialization_state_dcheck.h +++ b/util/misc/initialization_state_dcheck.h @@ -17,9 +17,9 @@ //! \file -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "build/build_config.h" #include "util/misc/initialization_state.h" diff --git a/util/misc/pdb_structures.h b/util/misc/pdb_structures.h index 04d76eec..218a7632 100644 --- a/util/misc/pdb_structures.h +++ b/util/misc/pdb_structures.h @@ -15,6 +15,8 @@ #ifndef CRASHPAD_UTIL_MISC_PDB_STRUCTURES_H_ #define CRASHPAD_UTIL_MISC_PDB_STRUCTURES_H_ +#include + #include "util/misc/uuid.h" namespace crashpad { diff --git a/util/misc/random_string_test.cc b/util/misc/random_string_test.cc index 3ef85df6..bb05a2bd 100644 --- a/util/misc/random_string_test.cc +++ b/util/misc/random_string_test.cc @@ -14,9 +14,11 @@ #include "util/misc/random_string.h" +#include + #include -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" namespace crashpad { diff --git a/util/misc/scoped_forbid_return.h b/util/misc/scoped_forbid_return.h index 8705be7a..4f1e214f 100644 --- a/util/misc/scoped_forbid_return.h +++ b/util/misc/scoped_forbid_return.h @@ -15,7 +15,7 @@ #ifndef CRASHPAD_UTIL_MISC_SCOPED_FORBID_RETURN_H_ #define CRASHPAD_UTIL_MISC_SCOPED_FORBID_RETURN_H_ -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad { diff --git a/util/misc/uuid.cc b/util/misc/uuid.cc index ca7b22b1..9ef55a65 100644 --- a/util/misc/uuid.cc +++ b/util/misc/uuid.cc @@ -22,7 +22,6 @@ #include #include -#include "base/basictypes.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" diff --git a/util/misc/uuid_test.cc b/util/misc/uuid_test.cc index 0dc6b425..673cedc8 100644 --- a/util/misc/uuid_test.cc +++ b/util/misc/uuid_test.cc @@ -14,12 +14,13 @@ #include "util/misc/uuid.h" -#include +#include +#include #include -#include "base/basictypes.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/scoped_generic.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" diff --git a/util/net/http_body.h b/util/net/http_body.h index 1646591e..4fca573c 100644 --- a/util/net/http_body.h +++ b/util/net/http_body.h @@ -21,8 +21,8 @@ #include #include -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "util/file/file_io.h" namespace crashpad { diff --git a/util/net/http_body_test.cc b/util/net/http_body_test.cc index ea4d8693..eb67f106 100644 --- a/util/net/http_body_test.cc +++ b/util/net/http_body_test.cc @@ -14,6 +14,8 @@ #include "util/net/http_body.h" +#include + #include "gtest/gtest.h" #include "test/paths.h" #include "util/misc/implicit_cast.h" diff --git a/util/net/http_multipart_builder.cc b/util/net/http_multipart_builder.cc index 83186af6..f4218569 100644 --- a/util/net/http_multipart_builder.cc +++ b/util/net/http_multipart_builder.cc @@ -14,6 +14,8 @@ #include "util/net/http_multipart_builder.h" +#include + #include #include diff --git a/util/net/http_multipart_builder.h b/util/net/http_multipart_builder.h index c9e03ce7..3ff7776b 100644 --- a/util/net/http_multipart_builder.h +++ b/util/net/http_multipart_builder.h @@ -18,8 +18,8 @@ #include #include -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "util/net/http_headers.h" diff --git a/util/net/http_multipart_builder_test.cc b/util/net/http_multipart_builder_test.cc index d024c520..66702256 100644 --- a/util/net/http_multipart_builder_test.cc +++ b/util/net/http_multipart_builder_test.cc @@ -14,6 +14,8 @@ #include "util/net/http_multipart_builder.h" +#include + #include #include "gtest/gtest.h" diff --git a/util/net/http_transport.h b/util/net/http_transport.h index 333986a9..1acc8e02 100644 --- a/util/net/http_transport.h +++ b/util/net/http_transport.h @@ -17,7 +17,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "util/net/http_headers.h" diff --git a/util/net/http_transport_test.cc b/util/net/http_transport_test.cc index 46e7a5f7..d015a5ac 100644 --- a/util/net/http_transport_test.cc +++ b/util/net/http_transport_test.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include diff --git a/util/net/http_transport_win.cc b/util/net/http_transport_win.cc index 9c3d00fe..95308ca3 100644 --- a/util/net/http_transport_win.cc +++ b/util/net/http_transport_win.cc @@ -15,6 +15,8 @@ #include "util/net/http_transport.h" #include +#include +#include #include #include "base/logging.h" diff --git a/util/numeric/checked_address_range.h b/util/numeric/checked_address_range.h index 65f85fbd..302e27d6 100644 --- a/util/numeric/checked_address_range.h +++ b/util/numeric/checked_address_range.h @@ -19,6 +19,7 @@ #include +#include "base/macros.h" #include "build/build_config.h" #include "util/numeric/checked_range.h" diff --git a/util/numeric/checked_address_range_test.cc b/util/numeric/checked_address_range_test.cc index d902387c..6b7e4c43 100644 --- a/util/numeric/checked_address_range_test.cc +++ b/util/numeric/checked_address_range_test.cc @@ -14,10 +14,12 @@ #include "util/numeric/checked_address_range.h" +#include + #include -#include "base/basictypes.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "gtest/gtest.h" diff --git a/util/numeric/checked_range.h b/util/numeric/checked_range.h index 972a038e..69fe9df8 100644 --- a/util/numeric/checked_range.h +++ b/util/numeric/checked_range.h @@ -17,7 +17,6 @@ #include -#include "base/basictypes.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/numerics/safe_math.h" diff --git a/util/numeric/checked_range_test.cc b/util/numeric/checked_range_test.cc index ea2e6edc..0b1ea32e 100644 --- a/util/numeric/checked_range_test.cc +++ b/util/numeric/checked_range_test.cc @@ -15,11 +15,12 @@ #include "util/numeric/checked_range.h" #include +#include #include -#include "base/basictypes.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" diff --git a/util/numeric/int128_test.cc b/util/numeric/int128_test.cc index e2f02a43..c0ad74e2 100644 --- a/util/numeric/int128_test.cc +++ b/util/numeric/int128_test.cc @@ -14,7 +14,7 @@ #include "util/numeric/int128.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" namespace crashpad { diff --git a/util/posix/close_stdio.cc b/util/posix/close_stdio.cc index 8ff59d0a..d5892947 100644 --- a/util/posix/close_stdio.cc +++ b/util/posix/close_stdio.cc @@ -18,7 +18,6 @@ #include #include -#include "base/basictypes.h" #include "base/files/scoped_file.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" diff --git a/util/posix/process_info.h b/util/posix/process_info.h index 4761cf36..5aeda25a 100644 --- a/util/posix/process_info.h +++ b/util/posix/process_info.h @@ -24,7 +24,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "util/misc/initialization_state_dcheck.h" diff --git a/util/posix/symbolic_constants_posix.cc b/util/posix/symbolic_constants_posix.cc index 326be9f3..c952e82a 100644 --- a/util/posix/symbolic_constants_posix.cc +++ b/util/posix/symbolic_constants_posix.cc @@ -14,10 +14,13 @@ #include "util/posix/symbolic_constants_posix.h" +#include +#include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "util/misc/implicit_cast.h" #include "util/stdlib/string_number_conversion.h" diff --git a/util/posix/symbolic_constants_posix_test.cc b/util/posix/symbolic_constants_posix_test.cc index db3193d4..72e37bd4 100644 --- a/util/posix/symbolic_constants_posix_test.cc +++ b/util/posix/symbolic_constants_posix_test.cc @@ -15,10 +15,12 @@ #include "util/posix/symbolic_constants_posix.h" #include +#include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "gtest/gtest.h" #define NUL_TEST_DATA(string) { string, arraysize(string) - 1 } diff --git a/util/stdlib/pointer_container.h b/util/stdlib/pointer_container.h index cb3e8364..c8354659 100644 --- a/util/stdlib/pointer_container.h +++ b/util/stdlib/pointer_container.h @@ -17,7 +17,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/stl_util.h" namespace crashpad { diff --git a/util/stdlib/string_number_conversion_test.cc b/util/stdlib/string_number_conversion_test.cc index 97d3152b..6fe6f813 100644 --- a/util/stdlib/string_number_conversion_test.cc +++ b/util/stdlib/string_number_conversion_test.cc @@ -14,11 +14,13 @@ #include "util/stdlib/string_number_conversion.h" -#include "base/basictypes.h" -#include "gtest/gtest.h" +#include #include +#include "base/macros.h" +#include "gtest/gtest.h" + namespace crashpad { namespace test { namespace { diff --git a/util/stdlib/strlcpy.h b/util/stdlib/strlcpy.h index 3fcc270f..20e1a718 100644 --- a/util/stdlib/strlcpy.h +++ b/util/stdlib/strlcpy.h @@ -15,7 +15,7 @@ #ifndef CRASHPAD_UTIL_STDLIB_STRLCPY_H_ #define CRASHPAD_UTIL_STDLIB_STRLCPY_H_ -#include +#include #include "base/strings/string16.h" diff --git a/util/stdlib/strlcpy_test.cc b/util/stdlib/strlcpy_test.cc index b9af2013..cbc61c0f 100644 --- a/util/stdlib/strlcpy_test.cc +++ b/util/stdlib/strlcpy_test.cc @@ -18,8 +18,8 @@ #include -#include "base/basictypes.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" diff --git a/util/stdlib/strnlen.h b/util/stdlib/strnlen.h index f1bbe638..e85d8c7e 100644 --- a/util/stdlib/strnlen.h +++ b/util/stdlib/strnlen.h @@ -16,6 +16,7 @@ #define CRASHPAD_UTIL_STDLIB_STRNLEN_H_ #include +#include #include "build/build_config.h" diff --git a/util/string/split_string.cc b/util/string/split_string.cc index 2123b4db..25048b56 100644 --- a/util/string/split_string.cc +++ b/util/string/split_string.cc @@ -14,6 +14,8 @@ #include "util/string/split_string.h" +#include + namespace crashpad { bool SplitString(const std::string& string, diff --git a/util/synchronization/semaphore_test.cc b/util/synchronization/semaphore_test.cc index f359cbdd..5f0563a6 100644 --- a/util/synchronization/semaphore_test.cc +++ b/util/synchronization/semaphore_test.cc @@ -14,12 +14,14 @@ #include "util/synchronization/semaphore.h" +#include + +#include "gtest/gtest.h" + #if defined(OS_POSIX) #include #endif // OS_POSIX -#include "gtest/gtest.h" - namespace crashpad { namespace test { namespace { diff --git a/util/thread/thread.h b/util/thread/thread.h index b1801f83..595d308e 100644 --- a/util/thread/thread.h +++ b/util/thread/thread.h @@ -15,7 +15,7 @@ #ifndef CRASHPAD_UTIL_THREAD_THREAD_H_ #define CRASHPAD_UTIL_THREAD_THREAD_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #if defined(OS_POSIX) diff --git a/util/thread/thread_log_messages.cc b/util/thread/thread_log_messages.cc index bada15a2..7f67e458 100644 --- a/util/thread/thread_log_messages.cc +++ b/util/thread/thread_log_messages.cc @@ -14,6 +14,8 @@ #include "util/thread/thread_log_messages.h" +#include + #include "base/lazy_instance.h" #include "base/logging.h" #include "base/threading/thread_local_storage.h" diff --git a/util/thread/thread_log_messages.h b/util/thread/thread_log_messages.h index 3f850df9..e8eef358 100644 --- a/util/thread/thread_log_messages.h +++ b/util/thread/thread_log_messages.h @@ -18,7 +18,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad { diff --git a/util/thread/thread_log_messages_test.cc b/util/thread/thread_log_messages_test.cc index e2590826..df5735b5 100644 --- a/util/thread/thread_log_messages_test.cc +++ b/util/thread/thread_log_messages_test.cc @@ -15,6 +15,7 @@ #include "util/thread/thread_log_messages.h" #include +#include #include "base/logging.h" #include "base/strings/stringprintf.h" diff --git a/util/thread/thread_test.cc b/util/thread/thread_test.cc index 7f7cf615..d92544b6 100644 --- a/util/thread/thread_test.cc +++ b/util/thread/thread_test.cc @@ -14,7 +14,7 @@ #include "util/thread/thread.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "util/synchronization/semaphore.h" diff --git a/util/thread/worker_thread.h b/util/thread/worker_thread.h index fbe8574f..748c99f5 100644 --- a/util/thread/worker_thread.h +++ b/util/thread/worker_thread.h @@ -15,7 +15,7 @@ #ifndef CRASHPAD_UTIL_THREAD_WORKER_THREAD_H_ #define CRASHPAD_UTIL_THREAD_WORKER_THREAD_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace crashpad { diff --git a/util/win/capture_context_test.cc b/util/win/capture_context_test.cc index 270ecb39..72b25874 100644 --- a/util/win/capture_context_test.cc +++ b/util/win/capture_context_test.cc @@ -15,10 +15,11 @@ #include "util/win/capture_context.h" #include +#include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "gtest/gtest.h" diff --git a/util/win/command_line.cc b/util/win/command_line.cc index 5829c12d..930c83c8 100644 --- a/util/win/command_line.cc +++ b/util/win/command_line.cc @@ -14,6 +14,8 @@ #include "util/win/command_line.h" +#include + namespace crashpad { // Ref: diff --git a/util/win/command_line_test.cc b/util/win/command_line_test.cc index d3179275..2577d6de 100644 --- a/util/win/command_line_test.cc +++ b/util/win/command_line_test.cc @@ -16,9 +16,10 @@ #include #include +#include -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/scoped_generic.h" #include "gtest/gtest.h" #include "test/errors.h" diff --git a/util/win/exception_handler_server.cc b/util/win/exception_handler_server.cc index 5559efbe..39575dff 100644 --- a/util/win/exception_handler_server.cc +++ b/util/win/exception_handler_server.cc @@ -15,7 +15,9 @@ #include "util/win/exception_handler_server.h" #include +#include #include +#include #include diff --git a/util/win/exception_handler_server.h b/util/win/exception_handler_server.h index 46141414..34c52783 100644 --- a/util/win/exception_handler_server.h +++ b/util/win/exception_handler_server.h @@ -18,7 +18,7 @@ #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "util/file/file_io.h" #include "util/win/address_types.h" diff --git a/util/win/exception_handler_server_test.cc b/util/win/exception_handler_server_test.cc index ee31e26d..c7f02574 100644 --- a/util/win/exception_handler_server_test.cc +++ b/util/win/exception_handler_server_test.cc @@ -15,11 +15,12 @@ #include "util/win/exception_handler_server.h" #include +#include #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "client/crashpad_client.h" #include "gtest/gtest.h" diff --git a/util/win/module_version.cc b/util/win/module_version.cc index f49df0cd..62f9e424 100644 --- a/util/win/module_version.cc +++ b/util/win/module_version.cc @@ -15,6 +15,7 @@ #include "util/win/module_version.h" #include +#include #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/util/win/ntstatus_logging.h b/util/win/ntstatus_logging.h index 0dc24601..7eececc9 100644 --- a/util/win/ntstatus_logging.h +++ b/util/win/ntstatus_logging.h @@ -17,8 +17,8 @@ #include -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" namespace logging { diff --git a/util/win/process_info.h b/util/win/process_info.h index 03624451..0bb8d735 100644 --- a/util/win/process_info.h +++ b/util/win/process_info.h @@ -15,13 +15,13 @@ #ifndef CRASHPAD_UTIL_WIN_PROCESS_INFO_H_ #define CRASHPAD_UTIL_WIN_PROCESS_INFO_H_ -#include #include +#include #include #include -#include "base/basictypes.h" +#include "base/macros.h" #include "util/misc/initialization_state_dcheck.h" #include "util/numeric/checked_range.h" #include "util/stdlib/aligned_allocator.h" diff --git a/util/win/process_info_test.cc b/util/win/process_info_test.cc index 6917ed9e..7f9b6dac 100644 --- a/util/win/process_info_test.cc +++ b/util/win/process_info_test.cc @@ -25,8 +25,8 @@ #include "build/build_config.h" #include "gtest/gtest.h" #include "test/errors.h" -#include "test/scoped_temp_dir.h" #include "test/paths.h" +#include "test/scoped_temp_dir.h" #include "test/win/child_launcher.h" #include "util/file/file_io.h" #include "util/misc/random_string.h" diff --git a/util/win/scoped_process_suspend.h b/util/win/scoped_process_suspend.h index dad2e29f..e5adea9c 100644 --- a/util/win/scoped_process_suspend.h +++ b/util/win/scoped_process_suspend.h @@ -17,7 +17,7 @@ #include -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad { diff --git a/util/win/time.cc b/util/win/time.cc index 1665b9c6..4c6fba19 100644 --- a/util/win/time.cc +++ b/util/win/time.cc @@ -14,7 +14,7 @@ #include "util/win/time.h" -#include +#include #include "base/logging.h"