Use base/macros.h instead of base/basictypes.h

This was done in Chromium’s local copy of Crashpad in 562827afb599. This
change is similar to that one, except more care was taken to avoid
including headers from a .cc or _test.cc when already included by the
associated .h. Rather than using <stddef.h> for size_t, Crashpad has
always used <sys/types.h>, so that’s used here as well.

This updates mini_chromium to 8a2363f486e3a0dc562a68884832d06d28d38dcc,
which removes base/basictypes.h.

e128dcf10122 Remove base/move.h; use std::move() instead of Pass()
8a2363f486e3 Move basictypes.h to macros.h

R=avi@chromium.org

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

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',

client/crash_report_database.h

@@ -20,8 +20,8 @@
 #include <string>
 #include <vector>
 
-#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"

client/crash_report_database_win.cc

@@ -14,9 +14,12 @@
 
 #include "client/crash_report_database.h"
 
-#include <string.h>
-#include <time.h>
 #include <windows.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/types.h>
+#include <time.h>
+#include <wchar.h>
 
 #include <utility>
 

client/crashpad_client.h

@@ -19,8 +19,8 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "build/build_config.h"
 
 #if defined(OS_MACOSX)

client/crashpad_client_mac.cc

@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <mach/mach.h>
 #include <pthread.h>
+#include <stdint.h>
 #include <sys/wait.h>
 #include <unistd.h>
 

client/crashpad_client_win.cc

@@ -14,8 +14,9 @@
 
 #include "client/crashpad_client.h"
 
-#include <string.h>
 #include <windows.h>
+#include <stdint.h>
+#include <string.h>
 
 #include "base/atomicops.h"
 #include "base/logging.h"

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 <stdint.h>
 
+#include "base/macros.h"
 #include "build/build_config.h"
 #include "client/simple_string_dictionary.h"
 #include "util/misc/tri_state.h"

client/prune_crash_reports.cc

@@ -20,6 +20,7 @@
 #include <vector>
 
 #include "base/logging.h"
+#include "build/build_config.h"
 
 namespace crashpad {
 

client/prune_crash_reports.h

@@ -15,9 +15,10 @@
 #ifndef CRASHPAD_CLIENT_PRUNE_CRASH_REPORTS_H_
 #define CRASHPAD_CLIENT_PRUNE_CRASH_REPORTS_H_
 
-#include <time.h>
 #include <sys/types.h>
+#include <time.h>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "client/crash_report_database.h"
 

client/settings.cc

@@ -14,6 +14,8 @@
 
 #include "client/settings.h"
 
+#include <stdint.h>
+
 #include <limits>
 
 #include "base/logging.h"

client/settings.h

@@ -19,8 +19,8 @@
 
 #include <string>
 
-#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"

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"

client/simple_string_dictionary.h

@@ -16,9 +16,10 @@
 #define CRASHPAD_CLIENT_SIMPLE_STRING_DICTIONARY_H_
 
 #include <string.h>
+#include <sys/types.h>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "util/misc/implicit_cast.h"
 
 namespace crashpad {

client/simulate_crash_mac.cc

@@ -15,11 +15,12 @@
 #include "client/simulate_crash_mac.h"
 
 #include <string.h>
+#include <sys/types.h>
 
-#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"

client/simulate_crash_mac_test.cc

@@ -16,8 +16,9 @@
 
 #include <mach/mach.h>
 #include <string.h>
+#include <sys/types.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"

compat/non_win/winnt.h

@@ -15,6 +15,8 @@
 #ifndef CRASHPAD_COMPAT_NON_WIN_WINNT_H_
 #define CRASHPAD_COMPAT_NON_WIN_WINNT_H_
 
+#include <stdint.h>
+
 //! \file
 
 //! \anchor VER_SUITE_x

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 <string>
 
+#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

handler/handler_main.cc

@@ -15,6 +15,7 @@
 #include "handler/handler_main.h"
 
 #include <getopt.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 #include <map>
@@ -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"

handler/mac/crash_report_exception_handler.h

@@ -20,7 +20,7 @@
 #include <map>
 #include <string>
 
-#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"

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 <mach/mach.h>
 
 #include "base/mac/scoped_mach_port.h"
+#include "base/macros.h"
 #include "util/mach/exc_server_variants.h"
 
 namespace crashpad {

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"
 

handler/win/crash_report_exception_handler.h

@@ -20,6 +20,7 @@
 #include <map>
 #include <string>
 
+#include "base/macros.h"
 #include "util/win/exception_handler_server.h"
 
 namespace crashpad {

handler/win/crashy_test_program.cc

@@ -14,25 +14,26 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <sys/types.h>
 #include <windows.h>
 #include <winternl.h>
 
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
+#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<NTSTATUS>(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 {
 

minidump/minidump_context_writer.cc

@@ -14,6 +14,7 @@
 
 #include "minidump/minidump_context_writer.h"
 
+#include <stdint.h>
 #include <string.h>
 
 #include "base/compiler_specific.h"

minidump/minidump_context_writer.h

@@ -17,7 +17,7 @@
 
 #include <sys/types.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "minidump/minidump_context.h"
 #include "minidump/minidump_writable.h"

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 <sys/types.h>
+
 #include <vector>
 
-#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"

minidump/minidump_exception_writer.cc

@@ -14,8 +14,6 @@
 
 #include "minidump/minidump_exception_writer.h"
 
-#include <sys/types.h>
-
 #include <utility>
 
 #include "base/logging.h"

minidump/minidump_exception_writer.h

@@ -18,10 +18,11 @@
 #include <windows.h>
 #include <dbghelp.h>
 #include <stdint.h>
+#include <sys/types.h>
 
 #include <vector>
 
-#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"

minidump/minidump_exception_writer_test.cc

@@ -14,14 +14,8 @@
 
 #include "minidump/minidump_exception_writer.h"
 
-#include <windows.h>
-#include <dbghelp.h>
-#include <stdint.h>
-#include <sys/types.h>
-
 #include <string>
 #include <utility>
-#include <vector>
 
 #include "gtest/gtest.h"
 #include "minidump/minidump_context.h"

minidump/minidump_file_writer.h

@@ -22,7 +22,7 @@
 #include <set>
 #include <vector>
 
-#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"

minidump/minidump_file_writer_test.cc

@@ -14,14 +14,14 @@
 
 #include "minidump/minidump_file_writer.h"
 
-#include <windows.h>
-#include <dbghelp.h>
+#include <stdint.h>
+#include <string.h>
 
 #include <string>
 #include <utility>
 
-#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"

minidump/minidump_handle_writer.h

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

minidump/minidump_memory_info_writer.h

@@ -18,10 +18,11 @@
 #include <windows.h>
 #include <dbghelp.h>
 #include <stdint.h>
+#include <sys/types.h>
 
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "minidump/minidump_stream_writer.h"
 #include "minidump/minidump_writable.h"
 

minidump/minidump_memory_writer.h

@@ -22,7 +22,7 @@
 
 #include <vector>
 
-#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"

minidump/minidump_memory_writer_test.cc

@@ -14,14 +14,10 @@
 
 #include "minidump/minidump_memory_writer.h"
 
-#include <windows.h>
-#include <dbghelp.h>
-#include <stdint.h>
-
 #include <utility>
 
-#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"

minidump/minidump_misc_info_writer.h

@@ -23,7 +23,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "minidump/minidump_stream_writer.h"
 #include "minidump/minidump_writable.h"
 

minidump/minidump_misc_info_writer_test.cc

@@ -14,15 +14,13 @@
 
 #include "minidump/minidump_misc_info_writer.h"
 
-#include <windows.h>
-#include <dbghelp.h>
 #include <string.h>
 
 #include <string>
 #include <utility>
 
-#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"

minidump/minidump_module_crashpad_info_writer.cc

@@ -14,8 +14,6 @@
 
 #include "minidump/minidump_module_crashpad_info_writer.h"
 
-#include <sys/types.h>
-
 #include <utility>
 
 #include "base/logging.h"

minidump/minidump_module_crashpad_info_writer.h

@@ -20,7 +20,7 @@
 
 #include <vector>
 
-#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"

minidump/minidump_module_writer.cc

@@ -14,8 +14,6 @@
 
 #include "minidump/minidump_module_writer.h"
 
-#include <sys/types.h>
-
 #include <limits>
 #include <utility>
 

minidump/minidump_module_writer.h

@@ -18,12 +18,13 @@
 #include <windows.h>
 #include <dbghelp.h>
 #include <stdint.h>
+#include <sys/types.h>
 #include <time.h>
 
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "minidump/minidump_extensions.h"

minidump/minidump_module_writer_test.cc

@@ -14,11 +14,7 @@
 
 #include "minidump/minidump_module_writer.h"
 
-#include <windows.h>
-#include <dbghelp.h>
-#include <stdint.h>
 #include <string.h>
-#include <sys/types.h>
 
 #include <utility>
 

minidump/minidump_rva_list_writer.h

@@ -20,7 +20,7 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_writable.h"

minidump/minidump_simple_string_dictionary_writer.h

@@ -17,11 +17,11 @@
 
 #include <sys/types.h>
 
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
-#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"

minidump/minidump_simple_string_dictionary_writer_test.cc

@@ -14,6 +14,8 @@
 
 #include "minidump/minidump_simple_string_dictionary_writer.h"
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <utility>

minidump/minidump_stream_writer.h

@@ -18,7 +18,7 @@
 #include <windows.h>
 #include <dbghelp.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_writable.h"
 

minidump/minidump_string_writer.cc

@@ -14,8 +14,6 @@
 
 #include "minidump/minidump_string_writer.h"
 
-#include <sys/types.h>
-
 #include <utility>
 
 #include "base/logging.h"

minidump/minidump_string_writer.h

@@ -17,11 +17,12 @@
 
 #include <windows.h>
 #include <dbghelp.h>
+#include <sys/types.h>
 
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "minidump/minidump_extensions.h"

minidump/minidump_string_writer_test.cc

@@ -14,15 +14,11 @@
 
 #include "minidump/minidump_string_writer.h"
 
-#include <windows.h>
-#include <dbghelp.h>
-#include <sys/types.h>
-
 #include <string>
 
-#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"

minidump/minidump_system_info_writer.cc

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

minidump/minidump_system_info_writer.h

@@ -18,11 +18,12 @@
 #include <windows.h>
 #include <dbghelp.h>
 #include <stdint.h>
+#include <sys/types.h>
 
 #include <string>
 #include <vector>
 
-#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"

minidump/minidump_system_info_writer_test.cc

@@ -14,10 +14,7 @@
 
 #include "minidump/minidump_system_info_writer.h"
 
-#include <windows.h>
-#include <dbghelp.h>
 #include <string.h>
-#include <sys/types.h>
 
 #include <algorithm>
 #include <string>

minidump/minidump_thread_id_map_test.cc

@@ -14,9 +14,11 @@
 
 #include "minidump/minidump_thread_id_map.h"
 
+#include <sys/types.h>
+
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "gtest/gtest.h"
 #include "snapshot/test/test_thread_snapshot.h"
 

minidump/minidump_thread_writer.cc

@@ -14,8 +14,6 @@
 
 #include "minidump/minidump_thread_writer.h"
 
-#include <sys/types.h>
-
 #include <utility>
 
 #include "base/logging.h"

minidump/minidump_thread_writer.h

@@ -18,10 +18,11 @@
 #include <windows.h>
 #include <dbghelp.h>
 #include <stdint.h>
+#include <sys/types.h>
 
 #include <vector>
 
-#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"

minidump/minidump_thread_writer_test.cc

@@ -14,10 +14,6 @@
 
 #include "minidump/minidump_thread_writer.h"
 
-#include <windows.h>
-#include <dbghelp.h>
-#include <sys/types.h>
-
 #include <string>
 #include <utility>
 
@@ -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"

minidump/minidump_writable.h

@@ -21,7 +21,7 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "util/file/file_io.h"
 
 namespace crashpad {

minidump/minidump_writable_test.cc

@@ -17,7 +17,7 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "gtest/gtest.h"
 #include "util/file/string_file.h"
 

minidump/minidump_writer_util.h

@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 
 namespace crashpad {

minidump/test/minidump_context_test_util.cc

@@ -14,8 +14,11 @@
 
 #include "minidump/test/minidump_context_test_util.h"
 
-#include "base/basictypes.h"
+#include <string.h>
+#include <sys/types.h>
+
 #include "base/format_macros.h"
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "snapshot/cpu_context.h"

minidump/test/minidump_memory_writer_test_util.h

@@ -20,10 +20,11 @@
 #include <windows.h>
 #include <dbghelp.h>
 #include <stdint.h>
+#include <sys/types.h>
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "util/file/file_writer.h"
 
 namespace crashpad {

minidump/test/minidump_rva_list_test_util.cc

@@ -16,6 +16,7 @@
 
 #include <windows.h>
 #include <dbghelp.h>
+#include <stdint.h>
 
 #include "minidump/minidump_extensions.h"
 #include "minidump/test/minidump_writable_test_util.h"

minidump/test/minidump_string_writer_test_util.cc

@@ -14,6 +14,8 @@
 
 #include "minidump/test/minidump_string_writer_test_util.h"
 
+#include <sys/types.h>
+
 #include "gtest/gtest.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/test/minidump_writable_test_util.h"

minidump/test/minidump_writable_test_util.h

@@ -22,7 +22,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_writable.h"

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"
 

snapshot/cpu_context_test.cc

@@ -14,10 +14,10 @@
 
 #include "snapshot/cpu_context.h"
 
-#include <stdint.h>
 #include <string.h>
+#include <sys/types.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "gtest/gtest.h"
 
 namespace crashpad {

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 <stdint.h>
+
 #include "util/misc/tri_state.h"
 
 namespace crashpad {

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"

snapshot/mac/exception_snapshot_mac.h

@@ -20,7 +20,7 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "build/build_config.h"
 #include "snapshot/cpu_context.h"
 #include "snapshot/exception_snapshot.h"

snapshot/mac/mach_o_image_annotations_reader.cc

@@ -16,6 +16,7 @@
 
 #include <mach-o/loader.h>
 #include <mach/mach.h>
+#include <sys/types.h>
 
 #include <utility>
 

snapshot/mac/mach_o_image_annotations_reader.h

@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "snapshot/mac/process_types.h"
 
 namespace crashpad {

snapshot/mac/mach_o_image_annotations_reader_test.cc

@@ -19,14 +19,15 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
-#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"

snapshot/mac/mach_o_image_reader.cc

@@ -19,8 +19,8 @@
 #include <string.h>
 
 #include <limits>
-#include <vector>
 #include <utility>
+#include <vector>
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"

snapshot/mac/mach_o_image_reader.h

@@ -17,11 +17,12 @@
 
 #include <mach/mach.h>
 #include <stdint.h>
+#include <sys/types.h>
 
 #include <map>
 #include <string>
 
-#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"

snapshot/mac/mach_o_image_segment_reader.h

@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "snapshot/mac/process_types.h"
 #include "util/misc/initialization_state_dcheck.h"
 

snapshot/mac/mach_o_image_segment_reader_test.cc

@@ -16,7 +16,7 @@
 
 #include <mach-o/loader.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 

snapshot/mac/mach_o_image_symbol_table_reader.cc

@@ -16,6 +16,7 @@
 
 #include <mach-o/loader.h>
 #include <mach-o/nlist.h>
+#include <sys/types.h>
 
 #include <utility>
 

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 <map>
 #include <string>
 
 #include <mach/mach.h>
 #include <stdint.h>
 
+#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"

snapshot/mac/memory_snapshot_mac.h

@@ -18,7 +18,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#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"

snapshot/mac/module_snapshot_mac.h

@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-#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"

snapshot/mac/process_reader.h

@@ -16,6 +16,7 @@
 #define CRASHPAD_SNAPSHOT_MAC_PROCESS_READER_H_
 
 #include <mach/mach.h>
+#include <stdint.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <time.h>
@@ -23,7 +24,7 @@
 #include <string>
 #include <vector>
 
-#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"

snapshot/mac/process_snapshot_mac.h

@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 
-#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"

snapshot/mac/process_types.cc

@@ -17,6 +17,7 @@
 #include <string.h>
 #include <uuid/uuid.h>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "snapshot/mac/process_types/internal.h"
 #include "util/mach/task_memory.h"

snapshot/mac/process_types/custom.cc

@@ -15,6 +15,7 @@
 #include "snapshot/mac/process_types.h"
 
 #include <string.h>
+#include <sys/types.h>
 
 #include "base/logging.h"
 #include "snapshot/mac/process_types/internal.h"

snapshot/mac/process_types_test.cc

@@ -20,8 +20,9 @@
 
 #include <vector>
 
-#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"

snapshot/mac/system_snapshot_mac.h

@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "snapshot/system_snapshot.h"
 #include "util/misc/initialization_state_dcheck.h"
 

snapshot/mac/thread_snapshot_mac.h

@@ -18,7 +18,7 @@
 #include <mach/mach.h>
 #include <stdint.h>
 
-#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"

snapshot/minidump/minidump_simple_string_dictionary_reader.cc

@@ -14,8 +14,10 @@
 
 #include "snapshot/minidump/minidump_simple_string_dictionary_reader.h"
 
-#include <vector>
+#include <stdint.h>
+
 #include <utility>
+#include <vector>
 
 #include "base/logging.h"
 #include "minidump/minidump_extensions.h"

snapshot/minidump/minidump_string_list_reader.cc

@@ -14,6 +14,8 @@
 
 #include "snapshot/minidump/minidump_string_list_reader.h"
 
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "minidump/minidump_extensions.h"
 #include "snapshot/minidump/minidump_string_reader.h"

snapshot/minidump/minidump_string_reader.cc

@@ -14,6 +14,8 @@
 
 #include "snapshot/minidump/minidump_string_reader.h"
 
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "minidump/minidump_extensions.h"
 

snapshot/minidump/module_snapshot_minidump.h

@@ -24,7 +24,7 @@
 #include <string>
 #include <vector>
 
-#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"

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 <sys/time.h>
 #include <windows.h>
 #include <dbghelp.h>
+#include <stdint.h>
+#include <sys/time.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
-#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"

snapshot/minidump/process_snapshot_minidump_test.cc

@@ -14,9 +14,9 @@
 
 #include "snapshot/minidump/process_snapshot_minidump.h"
 
-#include <string.h>
 #include <windows.h>
 #include <dbghelp.h>
+#include <string.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "gtest/gtest.h"

snapshot/test/test_cpu_context.cc

@@ -14,7 +14,10 @@
 
 #include "snapshot/test/test_cpu_context.h"
 
-#include "base/basictypes.h"
+#include <string.h>
+#include <sys/types.h>
+
+#include "base/macros.h"
 
 namespace crashpad {
 namespace test {

snapshot/test/test_exception_snapshot.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "snapshot/cpu_context.h"
 #include "snapshot/exception_snapshot.h"
 

snapshot/test/test_memory_map_region_snapshot.h

@@ -17,7 +17,7 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "snapshot/memory_map_region_snapshot.h"
 
 namespace crashpad {

snapshot/test/test_memory_snapshot.h

@@ -18,7 +18,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "snapshot/memory_snapshot.h"
 
 namespace crashpad {

snapshot/test/test_module_snapshot.h

@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "snapshot/module_snapshot.h"
 
 namespace crashpad {

snapshot/test/test_process_snapshot.h

@@ -24,7 +24,7 @@
 #include <utility>
 #include <vector>
 
-#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"

snapshot/test/test_system_snapshot.h

@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "snapshot/system_snapshot.h"
 
 namespace crashpad {