diff options
Diffstat (limited to 'chromium/third_party/crashpad')
132 files changed, 230 insertions, 110 deletions
diff --git a/chromium/third_party/crashpad/README.chromium b/chromium/third_party/crashpad/README.chromium index 21e2033ded6..1be4e18846a 100644 --- a/chromium/third_party/crashpad/README.chromium +++ b/chromium/third_party/crashpad/README.chromium @@ -2,7 +2,7 @@ Name: Crashpad Short Name: crashpad URL: https://crashpad.chromium.org/ Version: unknown -Revision: c7d1d2a1dd7cf2442cbb8aa8da7348fa01d54182 +Revision: b300f76af9ba095c7e85e70169429a19e467f42f License: Apache 2.0 License File: crashpad/LICENSE Security Critical: yes diff --git a/chromium/third_party/crashpad/crashpad/DEPS b/chromium/third_party/crashpad/crashpad/DEPS index eb9df6add75..ccb447cde9a 100644 --- a/chromium/third_party/crashpad/crashpad/DEPS +++ b/chromium/third_party/crashpad/crashpad/DEPS @@ -28,7 +28,7 @@ deps = { '4164a305626786b1912d467003acf4c4995bec7d', 'crashpad/third_party/edo/edo': { 'url': Var('chromium_git') + '/external/github.com/google/eDistantObject.git@' + - '243fc89ae95b24717d41f3786f6a9abeeef87c92', + '97121c64019fa0e8bfbc8254e3ccb5572c500746', 'condition': 'checkout_ios', }, 'crashpad/third_party/googletest/googletest': @@ -42,7 +42,7 @@ deps = { '7bde79cc274d06451bf65ae82c012a5d3e476b5a', 'crashpad/third_party/mini_chromium/mini_chromium': Var('chromium_git') + '/chromium/mini_chromium@' + - '8ca5ea356cdb97913d62d379d503567a80d90726', + 'ae14a14ab4cea36db9c446741581d427a7fc7f89', 'crashpad/third_party/libfuzzer/src': Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' + 'fda403cf93ecb8792cb1d061564d89a6553ca020', diff --git a/chromium/third_party/crashpad/crashpad/build/run_fuchsia_qemu.py b/chromium/third_party/crashpad/crashpad/build/run_fuchsia_qemu.py index aff0efd837c..67463e63a55 100755 --- a/chromium/third_party/crashpad/crashpad/build/run_fuchsia_qemu.py +++ b/chromium/third_party/crashpad/crashpad/build/run_fuchsia_qemu.py @@ -97,7 +97,7 @@ def _Start(pid_file): '-serial', 'stdio', '-monitor', 'none', '-machine', 'q35', - '-cpu', 'host,migratable=no', + '-cpu', 'host,migratable=no,+invtsc', '-enable-kvm', '-netdev', 'type=tap,ifname=qemu,script=no,downscript=no,id=net0', '-device', 'e1000,netdev=net0,mac=52:54:00:' + mac_tail, diff --git a/chromium/third_party/crashpad/crashpad/client/annotation.h b/chromium/third_party/crashpad/crashpad/client/annotation.h index 46cde62cbb8..ddfe8f644d9 100644 --- a/chromium/third_party/crashpad/crashpad/client/annotation.h +++ b/chromium/third_party/crashpad/crashpad/client/annotation.h @@ -22,7 +22,7 @@ #include <string.h> #include <sys/types.h> -#include "base/logging.h" +#include "base/check.h" #include "base/macros.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_piece.h" diff --git a/chromium/third_party/crashpad/crashpad/client/annotation_list.cc b/chromium/third_party/crashpad/crashpad/client/annotation_list.cc index 10f5ea49fcd..f847d7cf520 100644 --- a/chromium/third_party/crashpad/crashpad/client/annotation_list.cc +++ b/chromium/third_party/crashpad/crashpad/client/annotation_list.cc @@ -14,7 +14,7 @@ #include "client/annotation_list.h" -#include "base/logging.h" +#include "base/check_op.h" #include "client/crashpad_info.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/client/crash_report_database.cc b/chromium/third_party/crashpad/crashpad/client/crash_report_database.cc index eda0ef426c6..e1559ca7382 100644 --- a/chromium/third_party/crashpad/crashpad/client/crash_report_database.cc +++ b/chromium/third_party/crashpad/crashpad/client/crash_report_database.cc @@ -14,7 +14,6 @@ #include "client/crash_report_database.h" -#include "base/logging.h" #include "build/build_config.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/client/crashpad_client_linux_test.cc b/chromium/third_party/crashpad/crashpad/client/crashpad_client_linux_test.cc index 2bfda5a5017..01cf9f66cb2 100644 --- a/chromium/third_party/crashpad/crashpad/client/crashpad_client_linux_test.cc +++ b/chromium/third_party/crashpad/crashpad/client/crashpad_client_linux_test.cc @@ -20,7 +20,8 @@ #include <sys/types.h> #include <unistd.h> -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" #include "client/annotation.h" #include "client/annotation_list.h" #include "client/crash_report_database.h" diff --git a/chromium/third_party/crashpad/crashpad/client/crashpad_client_win.cc b/chromium/third_party/crashpad/crashpad/client/crashpad_client_win.cc index 4963f24f925..e1bdf72cc4d 100644 --- a/chromium/third_party/crashpad/crashpad/client/crashpad_client_win.cc +++ b/chromium/third_party/crashpad/crashpad/client/crashpad_client_win.cc @@ -274,8 +274,13 @@ void AddUint64(std::vector<unsigned char>* data_vector, uint64_t data) { //! \param[out] pipe_handle The first pipe instance corresponding for the pipe. void CreatePipe(std::wstring* pipe_name, ScopedFileHANDLE* pipe_instance) { int tries = 5; - std::string pipe_name_base = - base::StringPrintf("\\\\.\\pipe\\crashpad_%lu_", GetCurrentProcessId()); + std::string pipe_name_base = base::StringPrintf( +#if defined(WINDOWS_UWP) + "\\\\.\\pipe\\LOCAL\\crashpad_%lu_", +#else + "\\\\.\\pipe\\crashpad_%lu_", +#endif + GetCurrentProcessId()); do { *pipe_name = base::UTF8ToUTF16(pipe_name_base + RandomString()); diff --git a/chromium/third_party/crashpad/crashpad/client/crashpad_client_win_test.cc b/chromium/third_party/crashpad/crashpad/client/crashpad_client_win_test.cc index b950699ac23..f15887b9fa3 100644 --- a/chromium/third_party/crashpad/crashpad/client/crashpad_client_win_test.cc +++ b/chromium/third_party/crashpad/crashpad/client/crashpad_client_win_test.cc @@ -17,7 +17,6 @@ #include <vector> #include "base/files/file_path.h" -#include "base/logging.h" #include "gtest/gtest.h" #include "test/test_paths.h" #include "test/scoped_temp_dir.h" diff --git a/chromium/third_party/crashpad/crashpad/client/prune_crash_reports.cc b/chromium/third_party/crashpad/crashpad/client/prune_crash_reports.cc index 8eed18d4944..492d466239d 100644 --- a/chromium/third_party/crashpad/crashpad/client/prune_crash_reports.cc +++ b/chromium/third_party/crashpad/crashpad/client/prune_crash_reports.cc @@ -21,6 +21,7 @@ #include <vector> #include "base/logging.h" +#include "base/notreached.h" #include "build/build_config.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/client/simple_address_range_bag.h b/chromium/third_party/crashpad/crashpad/client/simple_address_range_bag.h index c69fa5afd8b..0a87a89b31d 100644 --- a/chromium/third_party/crashpad/crashpad/client/simple_address_range_bag.h +++ b/chromium/third_party/crashpad/crashpad/client/simple_address_range_bag.h @@ -16,9 +16,11 @@ #define CRASHPAD_CLIENT_SIMPLE_ADDRESS_RANGE_BAG_H_ #include <stdint.h> +#include <string.h> #include <type_traits> +#include "base/check_op.h" #include "base/logging.h" #include "base/macros.h" #include "base/numerics/safe_conversions.h" diff --git a/chromium/third_party/crashpad/crashpad/client/simple_address_range_bag_test.cc b/chromium/third_party/crashpad/crashpad/client/simple_address_range_bag_test.cc index e9a6d9f3351..4c3f34d1e1b 100644 --- a/chromium/third_party/crashpad/crashpad/client/simple_address_range_bag_test.cc +++ b/chromium/third_party/crashpad/crashpad/client/simple_address_range_bag_test.cc @@ -14,7 +14,6 @@ #include "client/simple_address_range_bag.h" -#include "base/logging.h" #include "gtest/gtest.h" #include "test/gtest_death.h" diff --git a/chromium/third_party/crashpad/crashpad/client/simple_string_dictionary.h b/chromium/third_party/crashpad/crashpad/client/simple_string_dictionary.h index 0e97736163d..31c7548de5f 100644 --- a/chromium/third_party/crashpad/crashpad/client/simple_string_dictionary.h +++ b/chromium/third_party/crashpad/crashpad/client/simple_string_dictionary.h @@ -21,7 +21,7 @@ #include <algorithm> #include <type_traits> -#include "base/logging.h" +#include "base/check_op.h" #include "base/macros.h" #include "base/strings/string_piece.h" #include "util/misc/implicit_cast.h" diff --git a/chromium/third_party/crashpad/crashpad/client/simple_string_dictionary_test.cc b/chromium/third_party/crashpad/crashpad/client/simple_string_dictionary_test.cc index cd23216c729..cc025a17410 100644 --- a/chromium/third_party/crashpad/crashpad/client/simple_string_dictionary_test.cc +++ b/chromium/third_party/crashpad/crashpad/client/simple_string_dictionary_test.cc @@ -14,7 +14,7 @@ #include "client/simple_string_dictionary.h" -#include "base/logging.h" +#include "base/check_op.h" #include "gtest/gtest.h" #include "test/gtest_death.h" diff --git a/chromium/third_party/crashpad/crashpad/client/simulate_crash_mac.cc b/chromium/third_party/crashpad/crashpad/client/simulate_crash_mac.cc index 43d05b81559..8d6e8bd9286 100644 --- a/chromium/third_party/crashpad/crashpad/client/simulate_crash_mac.cc +++ b/chromium/third_party/crashpad/crashpad/client/simulate_crash_mac.cc @@ -17,6 +17,7 @@ #include <string.h> #include <sys/types.h> +#include "base/check_op.h" #include "base/logging.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" diff --git a/chromium/third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc b/chromium/third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc index e144bddc67d..fd48e1b6bc1 100644 --- a/chromium/third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc +++ b/chromium/third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc @@ -23,6 +23,7 @@ #include <vector> #include "base/logging.h" +#include "base/notreached.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" diff --git a/chromium/third_party/crashpad/crashpad/handler/linux/exception_handler_server_test.cc b/chromium/third_party/crashpad/crashpad/handler/linux/exception_handler_server_test.cc index 7da5babeb0c..81687fdcb8a 100644 --- a/chromium/third_party/crashpad/crashpad/handler/linux/exception_handler_server_test.cc +++ b/chromium/third_party/crashpad/crashpad/handler/linux/exception_handler_server_test.cc @@ -17,7 +17,6 @@ #include <sys/types.h> #include <unistd.h> -#include "base/logging.h" #include "build/build_config.h" #include "gtest/gtest.h" #include "snapshot/linux/process_snapshot_linux.h" diff --git a/chromium/third_party/crashpad/crashpad/handler/win/hanging_program.cc b/chromium/third_party/crashpad/crashpad/handler/win/hanging_program.cc index f4e5b983af0..3fec43b2f04 100644 --- a/chromium/third_party/crashpad/crashpad/handler/win/hanging_program.cc +++ b/chromium/third_party/crashpad/crashpad/handler/win/hanging_program.cc @@ -17,6 +17,7 @@ #include "base/debug/alias.h" #include "base/logging.h" +#include "base/notreached.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" diff --git a/chromium/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer.cc b/chromium/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer.cc index 93be421ec82..e84f29b8ae6 100644 --- a/chromium/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer.cc +++ b/chromium/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer.cc @@ -16,7 +16,7 @@ #include <utility> -#include "base/logging.h" +#include "base/check_op.h" #include "minidump/minidump_module_crashpad_info_writer.h" #include "minidump/minidump_simple_string_dictionary_writer.h" #include "snapshot/process_snapshot.h" diff --git a/chromium/third_party/crashpad/crashpad/minidump/minidump_exception_writer.cc b/chromium/third_party/crashpad/crashpad/minidump/minidump_exception_writer.cc index b0e1e627237..e1a02da2ece 100644 --- a/chromium/third_party/crashpad/crashpad/minidump/minidump_exception_writer.cc +++ b/chromium/third_party/crashpad/crashpad/minidump/minidump_exception_writer.cc @@ -16,7 +16,7 @@ #include <utility> -#include "base/logging.h" +#include "base/check_op.h" #include "base/numerics/safe_conversions.h" #include "minidump/minidump_context_writer.h" #include "snapshot/exception_snapshot.h" diff --git a/chromium/third_party/crashpad/crashpad/minidump/minidump_memory_info_writer.cc b/chromium/third_party/crashpad/crashpad/minidump/minidump_memory_info_writer.cc index 8b6bdc8c91d..fe09225168e 100644 --- a/chromium/third_party/crashpad/crashpad/minidump/minidump_memory_info_writer.cc +++ b/chromium/third_party/crashpad/crashpad/minidump/minidump_memory_info_writer.cc @@ -14,7 +14,7 @@ #include "minidump/minidump_memory_info_writer.h" -#include "base/logging.h" +#include "base/check_op.h" #include "snapshot/memory_map_region_snapshot.h" #include "util/file/file_writer.h" diff --git a/chromium/third_party/crashpad/crashpad/minidump/minidump_stream_writer.cc b/chromium/third_party/crashpad/crashpad/minidump/minidump_stream_writer.cc index 8e5dcb30b85..3084ffed739 100644 --- a/chromium/third_party/crashpad/crashpad/minidump/minidump_stream_writer.cc +++ b/chromium/third_party/crashpad/crashpad/minidump/minidump_stream_writer.cc @@ -14,7 +14,7 @@ #include "minidump/minidump_stream_writer.h" -#include "base/logging.h" +#include "base/check_op.h" namespace crashpad { namespace internal { diff --git a/chromium/third_party/crashpad/crashpad/minidump/minidump_system_info_writer.cc b/chromium/third_party/crashpad/crashpad/minidump/minidump_system_info_writer.cc index 7b4b49dc65d..caec8f86bfb 100644 --- a/chromium/third_party/crashpad/crashpad/minidump/minidump_system_info_writer.cc +++ b/chromium/third_party/crashpad/crashpad/minidump/minidump_system_info_writer.cc @@ -16,7 +16,8 @@ #include <string.h> -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" #include "base/stl_util.h" #include "minidump/minidump_string_writer.h" #include "snapshot/system_snapshot.h" diff --git a/chromium/third_party/crashpad/crashpad/minidump/minidump_thread_id_map.cc b/chromium/third_party/crashpad/crashpad/minidump/minidump_thread_id_map.cc index 327d12e1352..3e9e39298e7 100644 --- a/chromium/third_party/crashpad/crashpad/minidump/minidump_thread_id_map.cc +++ b/chromium/third_party/crashpad/crashpad/minidump/minidump_thread_id_map.cc @@ -18,7 +18,7 @@ #include <set> #include <utility> -#include "base/logging.h" +#include "base/check_op.h" #include "base/numerics/safe_conversions.h" #include "snapshot/thread_snapshot.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc b/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc index a51626ccdc0..7a1b2763c08 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc @@ -19,6 +19,7 @@ #include <limits> #include <memory> +#include "base/logging.h" #include "base/stl_util.h" #include "snapshot/memory_snapshot.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.h b/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.h index d6a3a6dfbc3..a134824c174 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.h +++ b/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.h @@ -19,6 +19,7 @@ #include <vector> +#include "base/macros.h" #include "snapshot/cpu_context.h" #include "util/numeric/checked_range.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc b/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc index 6fb8d7e719f..c75b5555e1d 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc @@ -17,7 +17,7 @@ #include <stddef.h> #include <string.h> -#include "base/logging.h" +#include "base/notreached.h" #include "base/stl_util.h" #include "util/misc/arraysize.h" #include "util/misc/implicit_cast.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader_test.cc b/chromium/third_party/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader_test.cc index 63cfcfcc2ee..72a637bf11d 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader_test.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/crashpad_types/image_annotation_reader_test.cc @@ -20,7 +20,6 @@ #include <algorithm> -#include "base/logging.h" #include "build/build_config.h" #include "client/annotation.h" #include "client/annotation_list.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/elf/elf_image_reader.cc b/chromium/third_party/crashpad/crashpad/snapshot/elf/elf_image_reader.cc index 7f6d7c7e661..1f361ac785c 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/elf/elf_image_reader.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/elf/elf_image_reader.cc @@ -589,6 +589,14 @@ bool ElfImageReader::ReadDynamicStringTableAtOffset(VMSize offset, return false; } + // GNU ld.so doesn't adjust the vdso's dynamic array entries by the load bias. + // If the address is too small to point into the loaded module range and is + // small enough to be an offset from the base of the module, adjust it now. + if (string_table_address < memory_.Base() && + string_table_address < memory_.Size()) { + string_table_address += GetLoadBias(); + } + if (!memory_.ReadCStringSizeLimited( string_table_address + offset, string_table_size - offset, string)) { LOG(ERROR) << "missing nul-terminator"; diff --git a/chromium/third_party/crashpad/crashpad/snapshot/elf/elf_image_reader_test.cc b/chromium/third_party/crashpad/crashpad/snapshot/elf/elf_image_reader_test.cc index cf8f33b605a..34235a7d730 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/elf/elf_image_reader_test.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/elf/elf_image_reader_test.cc @@ -18,7 +18,6 @@ #include <link.h> #include <unistd.h> -#include "base/logging.h" #include "build/build_config.h" #include "gtest/gtest.h" #include "test/multiprocess_exec.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/elf/elf_symbol_table_reader.cc b/chromium/third_party/crashpad/crashpad/snapshot/elf/elf_symbol_table_reader.cc index c2c6abf0a81..5cdf5ba6f04 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/elf/elf_symbol_table_reader.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/elf/elf_symbol_table_reader.cc @@ -16,7 +16,6 @@ #include <elf.h> -#include "base/logging.h" #include "snapshot/elf/elf_image_reader.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc b/chromium/third_party/crashpad/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc index 1133c4d4c4a..6c74ac64be9 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc @@ -14,7 +14,7 @@ #include "snapshot/fuchsia/memory_map_region_snapshot_fuchsia.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/stl_util.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.cc b/chromium/third_party/crashpad/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.cc index c108529b890..36a4e50fcef 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.cc @@ -16,8 +16,9 @@ #include <zircon/syscalls.h> +#include "base/check_op.h" #include "base/fuchsia/fuchsia_logging.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/numerics/safe_conversions.h" #include "base/strings/stringprintf.h" #include "snapshot/posix/timezone.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.cc b/chromium/third_party/crashpad/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.cc index 462cdb1f21f..369203ae3cd 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.cc @@ -14,7 +14,7 @@ #include "snapshot/fuchsia/thread_snapshot_fuchsia.h" -#include "base/logging.h" +#include "base/check_op.h" #include "snapshot/fuchsia/cpu_context_fuchsia.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous.cc b/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous.cc index e27768dd4ce..42384f74335 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous.cc @@ -19,6 +19,11 @@ #include <set> #include "base/logging.h" +#include "build/build_config.h" + +#if defined(OS_ANDROID) +#include <android/api-level.h> +#endif namespace crashpad { @@ -137,6 +142,17 @@ bool DebugRendezvous::InitializeSpecific(const ProcessMemoryRange& memory, modules_.push_back(entry); } +#if defined(OS_ANDROID) + // Android P (API 28) mistakenly places the vdso in the first entry in the + // link map. + const int android_runtime_api = android_get_device_api_level(); + if (android_runtime_api == 28 && executable_.name == "[vdso]") { + LinkEntry executable = modules_[0]; + modules_[0] = executable_; + executable_ = executable; + } +#endif // OS_ANDROID + return true; } diff --git a/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc b/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc index be22c903133..71a0a7ba30b 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc @@ -74,6 +74,13 @@ void TestAgainstTarget(PtraceConnection* connection) { LinuxVMAddress debug_address; ASSERT_TRUE(exe_reader.GetDebugAddress(&debug_address)); + VMAddress exe_dynamic_address = 0; + if (exe_reader.GetDynamicArrayAddress(&exe_dynamic_address)) { + CheckedLinuxAddressRange exe_range( + connection->Is64Bit(), exe_reader.Address(), exe_reader.Size()); + EXPECT_TRUE(exe_range.ContainsValue(exe_dynamic_address)); + } + // start the actual tests DebugRendezvous debug; ASSERT_TRUE(debug.Initialize(range, debug_address)); @@ -85,8 +92,13 @@ void TestAgainstTarget(PtraceConnection* connection) { EXPECT_NE(debug.Executable()->name.find("crashpad_snapshot_test"), std::string::npos); - // Android's loader never sets the dynamic array for the executable. - EXPECT_EQ(debug.Executable()->dynamic_array, 0u); + // Android's loader doesn't set the dynamic array for the executable in the + // link map until Android 10.0 (API 29). + if (android_runtime_api >= 29) { + EXPECT_EQ(debug.Executable()->dynamic_array, exe_dynamic_address); + } else { + EXPECT_EQ(debug.Executable()->dynamic_array, 0u); + } #else // glibc's loader implements most of the tested features that Android's was // missing but has since gained. @@ -94,9 +106,7 @@ void TestAgainstTarget(PtraceConnection* connection) { // glibc's loader does not set the name for the executable. EXPECT_TRUE(debug.Executable()->name.empty()); - CheckedLinuxAddressRange exe_range( - connection->Is64Bit(), exe_reader.Address(), exe_reader.Size()); - EXPECT_TRUE(exe_range.ContainsValue(debug.Executable()->dynamic_array)); + EXPECT_EQ(debug.Executable()->dynamic_array, exe_dynamic_address); #endif // OS_ANDROID // Android's loader doesn't set the load bias until Android 4.3 (API 18). @@ -137,7 +147,8 @@ void TestAgainstTarget(PtraceConnection* connection) { while ((mapping = possible_mappings->Next())) { auto parsed_module = std::make_unique<ElfImageReader>(); VMAddress dynamic_address; - if (parsed_module->Initialize(range, mapping->range.Base()) && + if (parsed_module->Initialize( + range, mapping->range.Base(), possible_mappings->Count() == 0) && parsed_module->GetDynamicArrayAddress(&dynamic_address) && dynamic_address == module.dynamic_array) { module_reader = std::move(parsed_module); diff --git a/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc b/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc index b96abfe74fe..ee246e8bcbe 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc @@ -439,7 +439,7 @@ void ProcessReaderLinux::InitializeModules() { if (parsed_exe->Initialize( range, mapping->range.Base(), - /* verbose= */ possible_mappings->Count() == 1) && + /* verbose= */ possible_mappings->Count() == 0) && parsed_exe->GetProgramHeaderTableAddress() == phdrs) { exe_mapping = mapping; exe_reader = std::move(parsed_exe); @@ -508,7 +508,7 @@ void ProcessReaderLinux::InitializeModules() { if (parsed_module->Initialize( range, mapping->range.Base(), - /* verbose= */ possible_mappings->Count() == 1) && + /* verbose= */ possible_mappings->Count() == 0) && parsed_module->GetDynamicArrayAddress(&dynamic_address) && dynamic_address == entry.dynamic_array) { module_mapping = mapping; diff --git a/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc b/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc index 5b5723616fc..73e350dbf8d 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc @@ -491,23 +491,29 @@ int ExpectFindModule(dl_phdr_info* info, size_t size, void* data) { auto modules = reinterpret_cast<const std::vector<ProcessReaderLinux::Module>*>(data); - auto phdr_addr = FromPointerCast<LinuxVMAddress>(info->dlpi_phdr); #if defined(OS_ANDROID) - // Bionic includes a null entry. - if (!phdr_addr) { - EXPECT_EQ(info->dlpi_name, nullptr); + // Prior to API 27, Bionic includes a null entry for /system/bin/linker. + if (!info->dlpi_name) { EXPECT_EQ(info->dlpi_addr, 0u); EXPECT_EQ(info->dlpi_phnum, 0u); + EXPECT_EQ(info->dlpi_phdr, nullptr); return 0; } #endif + // Bionic doesn't always set both of these addresses for the vdso and + // /system/bin/linker, but it does always set one of them. + VMAddress module_addr = info->dlpi_phdr + ? FromPointerCast<LinuxVMAddress>(info->dlpi_phdr) + : info->dlpi_addr; + // TODO(jperaza): This can use a range map when one is available. bool found = false; for (const auto& module : *modules) { - if (module.elf_reader && phdr_addr >= module.elf_reader->Address() && - phdr_addr < module.elf_reader->Address() + module.elf_reader->Size()) { + if (module.elf_reader && module_addr >= module.elf_reader->Address() && + module_addr < + module.elf_reader->Address() + module.elf_reader->Size()) { found = true; break; } @@ -535,7 +541,8 @@ void ExpectModulesFromSelf( #endif // !OS_ANDROID || !ARCH_CPU_ARMEL || __ANDROID_API__ >= 21 } -bool WriteTestModule(const base::FilePath& module_path) { +bool WriteTestModule(const base::FilePath& module_path, + const std::string& soname) { #if defined(ARCH_CPU_64_BITS) using Ehdr = Elf64_Ehdr; using Phdr = Elf64_Phdr; @@ -565,6 +572,7 @@ bool WriteTestModule(const base::FilePath& module_path) { Dyn symtab; Dyn strsz; Dyn syment; + Dyn soname; Dyn null; } dynamic_array; struct { @@ -573,8 +581,9 @@ bool WriteTestModule(const base::FilePath& module_path) { Elf32_Word bucket; Elf32_Word chain; } hash_table; + char string_table[32]; struct { - } string_table; + } section_header_string_table; struct { Sym und_symbol; } symbol_table; @@ -582,6 +591,7 @@ bool WriteTestModule(const base::FilePath& module_path) { Shdr null; Shdr dynamic; Shdr string_table; + Shdr section_header_string_table; } shdr_table; } module = {}; @@ -624,7 +634,9 @@ bool WriteTestModule(const base::FilePath& module_path) { module.ehdr.e_shoff = offsetof(decltype(module), shdr_table); module.ehdr.e_shentsize = sizeof(Shdr); module.ehdr.e_shnum = sizeof(module.shdr_table) / sizeof(Shdr); - module.ehdr.e_shstrndx = SHN_UNDEF; + module.ehdr.e_shstrndx = + offsetof(decltype(module.shdr_table), section_header_string_table) / + sizeof(Shdr); constexpr size_t load2_vaddr = 0x200000; @@ -666,6 +678,9 @@ bool WriteTestModule(const base::FilePath& module_path) { module.dynamic_array.strsz.d_un.d_val = sizeof(module.string_table); module.dynamic_array.syment.d_tag = DT_SYMENT; module.dynamic_array.syment.d_un.d_val = sizeof(Sym); + constexpr size_t kSonameOffset = 1; + module.dynamic_array.soname.d_tag = DT_SONAME; + module.dynamic_array.soname.d_un.d_val = kSonameOffset; module.dynamic_array.null.d_tag = DT_NULL; @@ -674,6 +689,10 @@ bool WriteTestModule(const base::FilePath& module_path) { module.hash_table.bucket = 0; module.hash_table.chain = 0; + CHECK_GE(sizeof(module.string_table), soname.size() + 2); + module.string_table[0] = '\0'; + memcpy(&module.string_table[kSonameOffset], soname.c_str(), soname.size()); + module.shdr_table.null.sh_type = SHT_NULL; module.shdr_table.dynamic.sh_name = 0; @@ -689,6 +708,14 @@ bool WriteTestModule(const base::FilePath& module_path) { module.shdr_table.string_table.sh_type = SHT_STRTAB; module.shdr_table.string_table.sh_offset = offsetof(decltype(module), string_table); + module.shdr_table.string_table.sh_size = sizeof(module.string_table); + + module.shdr_table.section_header_string_table.sh_name = 0; + module.shdr_table.section_header_string_table.sh_type = SHT_STRTAB; + module.shdr_table.section_header_string_table.sh_offset = + offsetof(decltype(module), section_header_string_table); + module.shdr_table.section_header_string_table.sh_size = + sizeof(module.section_header_string_table); FileWriter writer; if (!writer.Open(module_path, @@ -706,11 +733,12 @@ bool WriteTestModule(const base::FilePath& module_path) { return true; } -ScopedModuleHandle LoadTestModule(const std::string& module_name) { +ScopedModuleHandle LoadTestModule(const std::string& module_name, + const std::string& module_soname) { base::FilePath module_path( TestPaths::Executable().DirName().Append(module_name)); - if (!WriteTestModule(module_path)) { + if (!WriteTestModule(module_path, module_soname)) { return ScopedModuleHandle(nullptr); } EXPECT_TRUE(IsRegularFile(module_path)); @@ -746,7 +774,9 @@ void ExpectTestModule(ProcessReaderLinux* reader, TEST(ProcessReaderLinux, SelfModules) { const std::string module_name = "test_module.so"; - ScopedModuleHandle empty_test_module(LoadTestModule(module_name)); + const std::string module_soname = "test_module_soname"; + ScopedModuleHandle empty_test_module( + LoadTestModule(module_name, module_soname)); ASSERT_TRUE(empty_test_module.valid()); FakePtraceConnection connection; @@ -756,12 +786,12 @@ TEST(ProcessReaderLinux, SelfModules) { ASSERT_TRUE(process_reader.Initialize(&connection)); ExpectModulesFromSelf(process_reader.Modules()); - ExpectTestModule(&process_reader, module_name); + ExpectTestModule(&process_reader, module_soname); } class ChildModuleTest : public Multiprocess { public: - ChildModuleTest() : Multiprocess(), module_name_("test_module.so") {} + ChildModuleTest() : Multiprocess(), module_soname_("test_module_soname") {} ~ChildModuleTest() = default; private: @@ -776,11 +806,12 @@ class ChildModuleTest : public Multiprocess { ASSERT_TRUE(process_reader.Initialize(&connection)); ExpectModulesFromSelf(process_reader.Modules()); - ExpectTestModule(&process_reader, module_name_); + ExpectTestModule(&process_reader, module_soname_); } void MultiprocessChild() override { - ScopedModuleHandle empty_test_module(LoadTestModule(module_name_)); + ScopedModuleHandle empty_test_module( + LoadTestModule("test_module.so", module_soname_)); ASSERT_TRUE(empty_test_module.valid()); char c = 0; @@ -789,7 +820,7 @@ class ChildModuleTest : public Multiprocess { CheckedReadFileAtEOF(ReadPipeHandle()); } - const std::string module_name_; + const std::string module_soname_; DISALLOW_COPY_AND_ASSIGN(ChildModuleTest); }; diff --git a/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc b/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc index 8564d3d4557..a99da3e4b6d 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc @@ -22,6 +22,7 @@ #include "base/files/file_path.h" #include "base/logging.h" +#include "base/notreached.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/mac/cpu_context_mac.cc b/chromium/third_party/crashpad/crashpad/snapshot/mac/cpu_context_mac.cc index 03893c40d0a..6e2950a506c 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/mac/cpu_context_mac.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/mac/cpu_context_mac.cc @@ -18,6 +18,7 @@ #include <string.h> #include "base/logging.h" +#include "base/notreached.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.cc b/chromium/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.cc index cbdac4022ae..bf72ac9c5f6 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.cc @@ -21,6 +21,7 @@ #include <memory> #include <utility> +#include "base/logging.h" #include "base/strings/stringprintf.h" #include "util/mac/checked_mach_address_range.h" #include "util/process/process_memory_mac.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/mac/process_reader_mac_test.cc b/chromium/third_party/crashpad/crashpad/snapshot/mac/process_reader_mac_test.cc index 9325b2c4ad7..2d64ff10a8c 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/mac/process_reader_mac_test.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/mac/process_reader_mac_test.cc @@ -26,7 +26,7 @@ #include <map> #include <utility> -#include "base/logging.h" +#include "base/check_op.h" #include "base/mac/mach_logging.h" #include "base/posix/eintr_wrapper.h" #include "base/stl_util.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.cc b/chromium/third_party/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.cc index 8fbb3e70e53..ddb4def4514 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.cc @@ -14,7 +14,7 @@ #include "snapshot/mac/thread_snapshot_mac.h" -#include "base/logging.h" +#include "base/check_op.h" #include "snapshot/mac/cpu_context_mac.h" #include "snapshot/mac/process_reader_mac.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/memory_snapshot.cc b/chromium/third_party/crashpad/crashpad/snapshot/memory_snapshot.cc index a4c8b038c1b..c86fa48d1b1 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/memory_snapshot.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/memory_snapshot.cc @@ -17,6 +17,7 @@ #include <algorithm> #include "base/format_macros.h" +#include "base/logging.h" #include "base/strings/stringprintf.h" #include "util/numeric/checked_range.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/memory_snapshot_generic.h b/chromium/third_party/crashpad/crashpad/snapshot/memory_snapshot_generic.h index d8bc9ec7517..6e50a585170 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/memory_snapshot_generic.h +++ b/chromium/third_party/crashpad/crashpad/snapshot/memory_snapshot_generic.h @@ -18,6 +18,7 @@ #include <stdint.h> #include <sys/types.h> +#include "base/logging.h" #include "base/macros.h" #include "base/numerics/safe_math.h" #include "snapshot/memory_snapshot.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc b/chromium/third_party/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc index 0c840deac22..01cfc28e148 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc @@ -14,6 +14,9 @@ #include "snapshot/minidump/minidump_context_converter.h" +#include <string.h> + +#include "base/logging.h" #include "base/stl_util.h" #include "minidump/minidump_context.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/minidump/minidump_string_reader.cc b/chromium/third_party/crashpad/crashpad/snapshot/minidump/minidump_string_reader.cc index d642e9d4a8f..a1494177fe8 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/minidump/minidump_string_reader.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/minidump/minidump_string_reader.cc @@ -16,7 +16,6 @@ #include <stdint.h> -#include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "minidump/minidump_extensions.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.cc b/chromium/third_party/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.cc index a316e83b768..698f535741c 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.cc @@ -18,6 +18,7 @@ #include <string.h> #include "base/logging.h" +#include "base/notreached.h" #include "minidump/minidump_extensions.h" #include "snapshot/minidump/minidump_annotation_reader.h" #include "snapshot/minidump/minidump_simple_string_dictionary_reader.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.cc b/chromium/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.cc index 6a032f90deb..8dc55802443 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.cc @@ -16,6 +16,8 @@ #include <utility> +#include "base/logging.h" +#include "base/notreached.h" #include "base/strings/utf_string_conversions.h" #include "minidump/minidump_extensions.h" #include "snapshot/memory_map_region_snapshot.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/minidump/system_snapshot_minidump.cc b/chromium/third_party/crashpad/crashpad/snapshot/minidump/system_snapshot_minidump.cc index 06bae484428..e4b1b032d1e 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/minidump/system_snapshot_minidump.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/minidump/system_snapshot_minidump.cc @@ -14,6 +14,7 @@ #include "snapshot/minidump/system_snapshot_minidump.h" +#include "base/notreached.h" #include "snapshot/minidump/minidump_string_reader.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/snapshot/posix/timezone_test.cc b/chromium/third_party/crashpad/crashpad/snapshot/posix/timezone_test.cc index b4405badbc2..73c39ba2517 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/posix/timezone_test.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/posix/timezone_test.cc @@ -20,7 +20,6 @@ #include <string> -#include "base/logging.h" #include "base/macros.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc b/chromium/third_party/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc index 5c5ff1a5367..85e540235bf 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc @@ -15,6 +15,7 @@ #include "snapshot/sanitized/process_snapshot_sanitized.h" #include "base/macros.h" +#include "base/notreached.h" #include "build/build_config.h" #include "gtest/gtest.h" #include "test/multiprocess_exec.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/sanitized/sanitization_information.cc b/chromium/third_party/crashpad/crashpad/snapshot/sanitized/sanitization_information.cc index ff376a39df9..5f7756f7a99 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/sanitized/sanitization_information.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/sanitized/sanitization_information.cc @@ -16,6 +16,7 @@ #include <limits> +#include "base/logging.h" #include "client/annotation.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_annotations.cc b/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_annotations.cc index 6005f4d0581..d46c3d72551 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_annotations.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_annotations.cc @@ -14,7 +14,7 @@ #include <windows.h> -#include "base/logging.h" +#include "base/check.h" #include "client/annotation.h" #include "client/annotation_list.h" #include "client/crashpad_info.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_crashing_child.cc b/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_crashing_child.cc index cc1369e6880..724bd572465 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_crashing_child.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_crashing_child.cc @@ -15,7 +15,7 @@ #include <intrin.h> #include <windows.h> -#include "base/logging.h" +#include "base/check_op.h" #include "client/crashpad_client.h" #include "util/misc/capture_context.h" #include "util/win/address_types.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc b/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc index cc441a4039a..eeeddf53fa4 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc @@ -15,7 +15,7 @@ #include <intrin.h> #include <windows.h> -#include "base/logging.h" +#include "base/check_op.h" #include "client/crashpad_client.h" #include "client/simulate_crash.h" #include "util/misc/capture_context.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_extra_memory_ranges.cc b/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_extra_memory_ranges.cc index e6875fdd8ee..6a18410352c 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_extra_memory_ranges.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/win/crashpad_snapshot_test_extra_memory_ranges.cc @@ -14,7 +14,7 @@ #include <windows.h> -#include "base/logging.h" +#include "base/check.h" #include "client/crashpad_info.h" #include "util/file/file_io.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win.cc b/chromium/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win.cc index 3413a403258..5759652d452 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win.cc @@ -14,6 +14,7 @@ #include "snapshot/win/exception_snapshot_win.h" +#include "base/logging.h" #include "client/crashpad_client.h" #include "snapshot/capture_memory.h" #include "snapshot/memory_snapshot.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.cc b/chromium/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.cc index 058342dbabb..8932e63bafe 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.cc @@ -17,6 +17,7 @@ #include <string.h> #include <sys/types.h> +#include "base/logging.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "client/annotation.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win.cc b/chromium/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win.cc index f07c4f67f4c..88cbc800de8 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win.cc @@ -23,6 +23,7 @@ #include <utility> #include <vector> +#include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" diff --git a/chromium/third_party/crashpad/crashpad/snapshot/win/thread_snapshot_win.cc b/chromium/third_party/crashpad/crashpad/snapshot/win/thread_snapshot_win.cc index 02cc63c5708..c3894a78b1e 100644 --- a/chromium/third_party/crashpad/crashpad/snapshot/win/thread_snapshot_win.cc +++ b/chromium/third_party/crashpad/crashpad/snapshot/win/thread_snapshot_win.cc @@ -17,10 +17,10 @@ #include <iterator> #include <vector> -#include "base/logging.h" +#include "base/check_op.h" #include "snapshot/capture_memory.h" -#include "snapshot/win/cpu_context_win.h" #include "snapshot/win/capture_memory_delegate_win.h" +#include "snapshot/win/cpu_context_win.h" #include "snapshot/win/process_reader_win.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/third_party/edo/BUILD.gn b/chromium/third_party/crashpad/crashpad/third_party/edo/BUILD.gn index 0205489fc29..2b8d5b994fc 100644 --- a/chromium/third_party/crashpad/crashpad/third_party/edo/BUILD.gn +++ b/chromium/third_party/crashpad/crashpad/third_party/edo/BUILD.gn @@ -99,6 +99,8 @@ if (crashpad_is_in_chromium) { "edo/Service/Sources/EDOParameter.m", "edo/Service/Sources/EDOProtocolObject.h", "edo/Service/Sources/EDOProtocolObject.m", + "edo/Service/Sources/EDORemoteException.h", + "edo/Service/Sources/EDORemoteException.m", "edo/Service/Sources/EDORemoteVariable.h", "edo/Service/Sources/EDORemoteVariable.m", "edo/Service/Sources/EDOServiceError.h", @@ -122,6 +124,8 @@ if (crashpad_is_in_chromium) { "edo/Service/Sources/NSKeyedArchiver+EDOAdditions.m", "edo/Service/Sources/NSKeyedUnarchiver+EDOAdditions.h", "edo/Service/Sources/NSKeyedUnarchiver+EDOAdditions.m", + "edo/Service/Sources/NSObject+EDOBlacklistedType.h", + "edo/Service/Sources/NSObject+EDOBlacklistedType.m", "edo/Service/Sources/NSObject+EDOParameter.h", "edo/Service/Sources/NSObject+EDOParameter.m", "edo/Service/Sources/NSObject+EDOValue.h", diff --git a/chromium/third_party/crashpad/crashpad/tools/crashpad_database_util.cc b/chromium/third_party/crashpad/crashpad/tools/crashpad_database_util.cc index a0036163c6f..176b8c7d1df 100644 --- a/chromium/third_party/crashpad/crashpad/tools/crashpad_database_util.cc +++ b/chromium/third_party/crashpad/crashpad/tools/crashpad_database_util.cc @@ -26,8 +26,8 @@ #include <utility> #include <vector> +#include "base/check_op.h" #include "base/files/file_path.h" -#include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/chromium/third_party/crashpad/crashpad/util/file/delimited_file_reader.cc b/chromium/third_party/crashpad/crashpad/util/file/delimited_file_reader.cc index 2275adefe10..e96b1b04868 100644 --- a/chromium/third_party/crashpad/crashpad/util/file/delimited_file_reader.cc +++ b/chromium/third_party/crashpad/crashpad/util/file/delimited_file_reader.cc @@ -19,7 +19,7 @@ #include <algorithm> #include <limits> -#include "base/logging.h" +#include "base/check_op.h" #include "base/numerics/safe_conversions.h" #include "base/stl_util.h" diff --git a/chromium/third_party/crashpad/crashpad/util/file/directory_reader_test.cc b/chromium/third_party/crashpad/crashpad/util/file/directory_reader_test.cc index 812deaf1394..5d09c6fb3dc 100644 --- a/chromium/third_party/crashpad/crashpad/util/file/directory_reader_test.cc +++ b/chromium/third_party/crashpad/crashpad/util/file/directory_reader_test.cc @@ -17,7 +17,6 @@ #include <set> #include "base/files/file_path.h" -#include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "gtest/gtest.h" diff --git a/chromium/third_party/crashpad/crashpad/util/file/file_io.cc b/chromium/third_party/crashpad/crashpad/util/file/file_io.cc index 55a6c5f1d98..c1da67226e4 100644 --- a/chromium/third_party/crashpad/crashpad/util/file/file_io.cc +++ b/chromium/third_party/crashpad/crashpad/util/file/file_io.cc @@ -14,6 +14,7 @@ #include "util/file/file_io.h" +#include "base/check_op.h" #include "base/logging.h" #include "base/macros.h" #include "base/numerics/safe_conversions.h" diff --git a/chromium/third_party/crashpad/crashpad/util/file/file_io_posix.cc b/chromium/third_party/crashpad/crashpad/util/file/file_io_posix.cc index 91b252a0090..001b2d97f8c 100644 --- a/chromium/third_party/crashpad/crashpad/util/file/file_io_posix.cc +++ b/chromium/third_party/crashpad/crashpad/util/file/file_io_posix.cc @@ -26,6 +26,7 @@ #include "base/files/file_path.h" #include "base/logging.h" +#include "base/notreached.h" #include "base/posix/eintr_wrapper.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" diff --git a/chromium/third_party/crashpad/crashpad/util/file/file_io_win.cc b/chromium/third_party/crashpad/crashpad/util/file/file_io_win.cc index 111a8da2edc..3d0d7772a63 100644 --- a/chromium/third_party/crashpad/crashpad/util/file/file_io_win.cc +++ b/chromium/third_party/crashpad/crashpad/util/file/file_io_win.cc @@ -19,6 +19,7 @@ #include "base/files/file_path.h" #include "base/logging.h" +#include "base/notreached.h" #include "base/strings/utf_string_conversions.h" namespace { diff --git a/chromium/third_party/crashpad/crashpad/util/file/filesystem_test.cc b/chromium/third_party/crashpad/crashpad/util/file/filesystem_test.cc index 37a9290ba7c..e1f66867a90 100644 --- a/chromium/third_party/crashpad/crashpad/util/file/filesystem_test.cc +++ b/chromium/third_party/crashpad/crashpad/util/file/filesystem_test.cc @@ -16,7 +16,6 @@ #include <sys/time.h> -#include "base/logging.h" #include "build/build_config.h" #include "gtest/gtest.h" #include "test/errors.h" diff --git a/chromium/third_party/crashpad/crashpad/util/file/output_stream_file_writer.cc b/chromium/third_party/crashpad/crashpad/util/file/output_stream_file_writer.cc index 1172019edb9..d55c0ad335b 100644 --- a/chromium/third_party/crashpad/crashpad/util/file/output_stream_file_writer.cc +++ b/chromium/third_party/crashpad/crashpad/util/file/output_stream_file_writer.cc @@ -15,6 +15,7 @@ #include "util/file/output_stream_file_writer.h" #include "base/logging.h" +#include "base/notreached.h" #include "util/stream/output_stream_interface.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/linux/proc_stat_reader_test.cc b/chromium/third_party/crashpad/crashpad/util/linux/proc_stat_reader_test.cc index 01b9afd7977..1c0c0ae43ca 100644 --- a/chromium/third_party/crashpad/crashpad/util/linux/proc_stat_reader_test.cc +++ b/chromium/third_party/crashpad/crashpad/util/linux/proc_stat_reader_test.cc @@ -18,7 +18,6 @@ #include <time.h> #include <unistd.h> -#include "base/logging.h" #include "gtest/gtest.h" #include "test/linux/fake_ptrace_connection.h" #include "util/misc/time.h" diff --git a/chromium/third_party/crashpad/crashpad/util/linux/proc_task_reader_test.cc b/chromium/third_party/crashpad/crashpad/util/linux/proc_task_reader_test.cc index 911f6d3d2f6..a93b2d4e467 100644 --- a/chromium/third_party/crashpad/crashpad/util/linux/proc_task_reader_test.cc +++ b/chromium/third_party/crashpad/crashpad/util/linux/proc_task_reader_test.cc @@ -14,7 +14,6 @@ #include "util/linux/proc_task_reader.h" -#include "base/logging.h" #include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" diff --git a/chromium/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc b/chromium/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc index 155a1e0c6f4..b6b5bb131de 100644 --- a/chromium/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc +++ b/chromium/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc @@ -22,7 +22,7 @@ #include <algorithm> -#include "base/logging.h" +#include "base/check_op.h" #include "base/posix/eintr_wrapper.h" #include "util/misc/memory_sanitizer.h" diff --git a/chromium/third_party/crashpad/crashpad/util/linux/ptrace_client.cc b/chromium/third_party/crashpad/crashpad/util/linux/ptrace_client.cc index f097ad98593..43214a18af2 100644 --- a/chromium/third_party/crashpad/crashpad/util/linux/ptrace_client.cc +++ b/chromium/third_party/crashpad/crashpad/util/linux/ptrace_client.cc @@ -16,6 +16,7 @@ #include <errno.h> #include <stdio.h> +#include <string.h> #include <string> diff --git a/chromium/third_party/crashpad/crashpad/util/linux/socket.cc b/chromium/third_party/crashpad/crashpad/util/linux/socket.cc index f56eacf677c..f2ad9bd0cd5 100644 --- a/chromium/third_party/crashpad/crashpad/util/linux/socket.cc +++ b/chromium/third_party/crashpad/crashpad/util/linux/socket.cc @@ -16,6 +16,7 @@ #include <unistd.h> +#include "base/check_op.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "third_party/lss/lss.h" diff --git a/chromium/third_party/crashpad/crashpad/util/linux/socket_test.cc b/chromium/third_party/crashpad/crashpad/util/linux/socket_test.cc index 4e583aedf66..d73ec0b482e 100644 --- a/chromium/third_party/crashpad/crashpad/util/linux/socket_test.cc +++ b/chromium/third_party/crashpad/crashpad/util/linux/socket_test.cc @@ -14,7 +14,6 @@ #include "util/linux/socket.h" -#include "base/logging.h" #include "base/macros.h" #include "base/posix/eintr_wrapper.h" #include "gtest/gtest.h" diff --git a/chromium/third_party/crashpad/crashpad/util/mach/child_port_handshake.cc b/chromium/third_party/crashpad/crashpad/util/mach/child_port_handshake.cc index 3ff9828b844..601a58fe971 100644 --- a/chromium/third_party/crashpad/crashpad/util/mach/child_port_handshake.cc +++ b/chromium/third_party/crashpad/crashpad/util/mach/child_port_handshake.cc @@ -26,9 +26,11 @@ #include <algorithm> #include <utility> +#include "base/check_op.h" #include "base/logging.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" +#include "base/notreached.h" #include "base/posix/eintr_wrapper.h" #include "base/rand_util.h" #include "base/stl_util.h" diff --git a/chromium/third_party/crashpad/crashpad/util/mach/child_port_server.cc b/chromium/third_party/crashpad/crashpad/util/mach/child_port_server.cc index aa7a1b8bfbf..ce425a84658 100644 --- a/chromium/third_party/crashpad/crashpad/util/mach/child_port_server.cc +++ b/chromium/third_party/crashpad/crashpad/util/mach/child_port_server.cc @@ -14,7 +14,6 @@ #include "util/mach/child_port_server.h" -#include "base/logging.h" #include "base/stl_util.h" #include "util/mach/child_portServer.h" #include "util/mach/mach_message.h" diff --git a/chromium/third_party/crashpad/crashpad/util/mach/composite_mach_message_server.cc b/chromium/third_party/crashpad/crashpad/util/mach/composite_mach_message_server.cc index abbe5bcf388..6b955006a26 100644 --- a/chromium/third_party/crashpad/crashpad/util/mach/composite_mach_message_server.cc +++ b/chromium/third_party/crashpad/crashpad/util/mach/composite_mach_message_server.cc @@ -15,9 +15,10 @@ #include "util/mach/composite_mach_message_server.h" #include <algorithm> +#include <ostream> #include <utility> -#include "base/logging.h" +#include "base/check_op.h" #include "util/mach/mach_message.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/mach/exc_client_variants.cc b/chromium/third_party/crashpad/crashpad/util/mach/exc_client_variants.cc index e7945b220cd..9b877748663 100644 --- a/chromium/third_party/crashpad/crashpad/util/mach/exc_client_variants.cc +++ b/chromium/third_party/crashpad/crashpad/util/mach/exc_client_variants.cc @@ -18,7 +18,7 @@ #include <vector> -#include "base/logging.h" +#include "base/notreached.h" #include "util/mach/exc.h" #include "util/mach/mach_exc.h" diff --git a/chromium/third_party/crashpad/crashpad/util/mach/exc_server_variants.cc b/chromium/third_party/crashpad/crashpad/util/mach/exc_server_variants.cc index c272ae72207..e4c2d19e142 100644 --- a/chromium/third_party/crashpad/crashpad/util/mach/exc_server_variants.cc +++ b/chromium/third_party/crashpad/crashpad/util/mach/exc_server_variants.cc @@ -20,7 +20,6 @@ #include <algorithm> #include <vector> -#include "base/logging.h" #include "base/stl_util.h" #include "build/build_config.h" #include "util/mac/mac_util.h" diff --git a/chromium/third_party/crashpad/crashpad/util/mach/exception_ports.cc b/chromium/third_party/crashpad/crashpad/util/mach/exception_ports.cc index 375d29e3755..02fed19c96a 100644 --- a/chromium/third_party/crashpad/crashpad/util/mach/exception_ports.cc +++ b/chromium/third_party/crashpad/crashpad/util/mach/exception_ports.cc @@ -16,6 +16,7 @@ #include "base/logging.h" #include "base/mac/mach_logging.h" +#include "base/notreached.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/mach/exception_ports_test.cc b/chromium/third_party/crashpad/crashpad/util/mach/exception_ports_test.cc index c72dec91a5b..6dbc04ed170 100644 --- a/chromium/third_party/crashpad/crashpad/util/mach/exception_ports_test.cc +++ b/chromium/third_party/crashpad/crashpad/util/mach/exception_ports_test.cc @@ -19,10 +19,11 @@ #include <signal.h> #include <unistd.h> -#include "base/logging.h" +#include "base/check.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" #include "base/macros.h" +#include "base/notreached.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h" diff --git a/chromium/third_party/crashpad/crashpad/util/mach/exception_types.cc b/chromium/third_party/crashpad/crashpad/util/mach/exception_types.cc index e133cb9ad61..2a1f3c013af 100644 --- a/chromium/third_party/crashpad/crashpad/util/mach/exception_types.cc +++ b/chromium/third_party/crashpad/crashpad/util/mach/exception_types.cc @@ -22,6 +22,7 @@ #include <kern/exc_resource.h> #include <strings.h> +#include "base/check_op.h" #include "base/logging.h" #include "base/mac/mach_logging.h" #include "util/mac/mac_util.h" diff --git a/chromium/third_party/crashpad/crashpad/util/mach/notify_server.cc b/chromium/third_party/crashpad/crashpad/util/mach/notify_server.cc index b9da7958922..df47327eecf 100644 --- a/chromium/third_party/crashpad/crashpad/util/mach/notify_server.cc +++ b/chromium/third_party/crashpad/crashpad/util/mach/notify_server.cc @@ -14,7 +14,6 @@ #include "util/mach/notify_server.h" -#include "base/logging.h" #include "base/stl_util.h" #include "util/mach/mach_message.h" #include "util/mach/notifyServer.h" diff --git a/chromium/third_party/crashpad/crashpad/util/mach/scoped_task_suspend.cc b/chromium/third_party/crashpad/crashpad/util/mach/scoped_task_suspend.cc index abca77e302a..651cad25b0e 100644 --- a/chromium/third_party/crashpad/crashpad/util/mach/scoped_task_suspend.cc +++ b/chromium/third_party/crashpad/crashpad/util/mach/scoped_task_suspend.cc @@ -14,6 +14,7 @@ #include "util/mach/scoped_task_suspend.h" +#include "base/check_op.h" #include "base/logging.h" #include "base/mac/mach_logging.h" diff --git a/chromium/third_party/crashpad/crashpad/util/misc/capture_context_broken.cc b/chromium/third_party/crashpad/crashpad/util/misc/capture_context_broken.cc index ab7a59748b0..ea6d0a0cf9e 100644 --- a/chromium/third_party/crashpad/crashpad/util/misc/capture_context_broken.cc +++ b/chromium/third_party/crashpad/crashpad/util/misc/capture_context_broken.cc @@ -14,7 +14,9 @@ #include "util/misc/capture_context.h" -#include "base/logging.h" +#include <ostream> + +#include "base/check.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_fuchsia.cc b/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_fuchsia.cc index 7f9210ed03e..3d2a1805aa7 100644 --- a/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_fuchsia.cc +++ b/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_fuchsia.cc @@ -14,7 +14,6 @@ #include "util/misc/capture_context_test_util.h" -#include "base/logging.h" #include "gtest/gtest.h" #include "util/misc/from_pointer_cast.h" diff --git a/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc b/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc index 9fc5db28c48..30a2ab21df1 100644 --- a/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc +++ b/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc @@ -14,7 +14,6 @@ #include "util/misc/capture_context_test_util.h" -#include "base/logging.h" #include "gtest/gtest.h" #include "util/misc/from_pointer_cast.h" diff --git a/chromium/third_party/crashpad/crashpad/util/misc/clock_posix.cc b/chromium/third_party/crashpad/crashpad/util/misc/clock_posix.cc index 51c1406d3c6..f0a241672c8 100644 --- a/chromium/third_party/crashpad/crashpad/util/misc/clock_posix.cc +++ b/chromium/third_party/crashpad/crashpad/util/misc/clock_posix.cc @@ -16,7 +16,9 @@ #include <time.h> -#include "base/logging.h" +#include <ostream> + +#include "base/check.h" #include "base/posix/eintr_wrapper.h" #include "build/build_config.h" diff --git a/chromium/third_party/crashpad/crashpad/util/misc/clock_test.cc b/chromium/third_party/crashpad/crashpad/util/misc/clock_test.cc index 6bfb87b4767..b1740b8c6a9 100644 --- a/chromium/third_party/crashpad/crashpad/util/misc/clock_test.cc +++ b/chromium/third_party/crashpad/crashpad/util/misc/clock_test.cc @@ -19,7 +19,6 @@ #include <algorithm> #include "base/format_macros.h" -#include "base/logging.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" diff --git a/chromium/third_party/crashpad/crashpad/util/misc/initialization_state_dcheck.h b/chromium/third_party/crashpad/crashpad/util/misc/initialization_state_dcheck.h index 7b6df9863ba..9fcfc76057d 100644 --- a/chromium/third_party/crashpad/crashpad/util/misc/initialization_state_dcheck.h +++ b/chromium/third_party/crashpad/crashpad/util/misc/initialization_state_dcheck.h @@ -17,8 +17,8 @@ //! \file +#include "base/check_op.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/chromium/third_party/crashpad/crashpad/util/misc/initialization_state_dcheck_test.cc b/chromium/third_party/crashpad/crashpad/util/misc/initialization_state_dcheck_test.cc index f954d004ac1..3e823c8a116 100644 --- a/chromium/third_party/crashpad/crashpad/util/misc/initialization_state_dcheck_test.cc +++ b/chromium/third_party/crashpad/crashpad/util/misc/initialization_state_dcheck_test.cc @@ -18,7 +18,7 @@ #include <memory> -#include "base/logging.h" +#include "base/check_op.h" #include "base/memory/free_deleter.h" #include "gtest/gtest.h" #include "test/gtest_death.h" diff --git a/chromium/third_party/crashpad/crashpad/util/misc/paths_fuchsia.cc b/chromium/third_party/crashpad/crashpad/util/misc/paths_fuchsia.cc index 6dea63373c1..4ee88f98c67 100644 --- a/chromium/third_party/crashpad/crashpad/util/misc/paths_fuchsia.cc +++ b/chromium/third_party/crashpad/crashpad/util/misc/paths_fuchsia.cc @@ -18,7 +18,6 @@ #include <zircon/process.h> #include <zircon/syscalls.h> -#include "base/logging.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/misc/time_win.cc b/chromium/third_party/crashpad/crashpad/util/misc/time_win.cc index d9c4156b6d1..acadd792484 100644 --- a/chromium/third_party/crashpad/crashpad/util/misc/time_win.cc +++ b/chromium/third_party/crashpad/crashpad/util/misc/time_win.cc @@ -16,7 +16,7 @@ #include <stdint.h> -#include "base/logging.h" +#include "base/check_op.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/misc/uuid.cc b/chromium/third_party/crashpad/crashpad/util/misc/uuid.cc index ffd497083f2..5655bc2cd2c 100644 --- a/chromium/third_party/crashpad/crashpad/util/misc/uuid.cc +++ b/chromium/third_party/crashpad/crashpad/util/misc/uuid.cc @@ -25,7 +25,6 @@ #include <type_traits> -#include "base/logging.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" diff --git a/chromium/third_party/crashpad/crashpad/util/misc/zlib.cc b/chromium/third_party/crashpad/crashpad/util/misc/zlib.cc index b26f9c90cb9..1153bcbe15a 100644 --- a/chromium/third_party/crashpad/crashpad/util/misc/zlib.cc +++ b/chromium/third_party/crashpad/crashpad/util/misc/zlib.cc @@ -14,7 +14,9 @@ #include "util/misc/zlib.h" -#include "base/logging.h" +#include <ostream> + +#include "base/check.h" #include "base/strings/stringprintf.h" #include "third_party/zlib/zlib_crashpad.h" diff --git a/chromium/third_party/crashpad/crashpad/util/net/http_body.cc b/chromium/third_party/crashpad/crashpad/util/net/http_body.cc index 7abe3a49ce7..4acacea7253 100644 --- a/chromium/third_party/crashpad/crashpad/util/net/http_body.cc +++ b/chromium/third_party/crashpad/crashpad/util/net/http_body.cc @@ -19,7 +19,7 @@ #include <algorithm> #include <limits> -#include "base/logging.h" +#include "base/check.h" #include "util/misc/implicit_cast.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/net/http_multipart_builder.cc b/chromium/third_party/crashpad/crashpad/util/net/http_multipart_builder.cc index 267960b274f..9ad7c90e8f7 100644 --- a/chromium/third_party/crashpad/crashpad/util/net/http_multipart_builder.cc +++ b/chromium/third_party/crashpad/crashpad/util/net/http_multipart_builder.cc @@ -14,12 +14,13 @@ #include "util/net/http_multipart_builder.h" +#include <string.h> #include <sys/types.h> #include <utility> #include <vector> -#include "base/logging.h" +#include "base/check.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h" #include "util/net/http_body.h" diff --git a/chromium/third_party/crashpad/crashpad/util/net/http_transport_socket.cc b/chromium/third_party/crashpad/crashpad/util/net/http_transport_socket.cc index 4dd01b6e7a6..b9c6c9c5e06 100644 --- a/chromium/third_party/crashpad/crashpad/util/net/http_transport_socket.cc +++ b/chromium/third_party/crashpad/crashpad/util/net/http_transport_socket.cc @@ -17,6 +17,7 @@ #include <fcntl.h> #include <netdb.h> #include <poll.h> +#include <string.h> #include <sys/socket.h> #include "base/logging.h" diff --git a/chromium/third_party/crashpad/crashpad/util/net/http_transport_test.cc b/chromium/third_party/crashpad/crashpad/util/net/http_transport_test.cc index 14d1a80aff2..a2a2e39660a 100644 --- a/chromium/third_party/crashpad/crashpad/util/net/http_transport_test.cc +++ b/chromium/third_party/crashpad/crashpad/util/net/http_transport_test.cc @@ -25,7 +25,6 @@ #include "base/files/file_path.h" #include "base/format_macros.h" -#include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" diff --git a/chromium/third_party/crashpad/crashpad/util/numeric/checked_address_range.cc b/chromium/third_party/crashpad/crashpad/util/numeric/checked_address_range.cc index b2784fc0fb8..c6c932d45e0 100644 --- a/chromium/third_party/crashpad/crashpad/util/numeric/checked_address_range.cc +++ b/chromium/third_party/crashpad/crashpad/util/numeric/checked_address_range.cc @@ -14,6 +14,7 @@ #include "util/numeric/checked_address_range.h" +#include "base/check_op.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" diff --git a/chromium/third_party/crashpad/crashpad/util/numeric/checked_range.h b/chromium/third_party/crashpad/crashpad/util/numeric/checked_range.h index 09dfc22727f..dbf719179ba 100644 --- a/chromium/third_party/crashpad/crashpad/util/numeric/checked_range.h +++ b/chromium/third_party/crashpad/crashpad/util/numeric/checked_range.h @@ -18,7 +18,7 @@ #include <limits> #include <tuple> -#include "base/logging.h" +#include "base/check.h" #include "base/numerics/safe_conversions.h" #include "base/numerics/safe_math.h" #include "util/misc/implicit_cast.h" diff --git a/chromium/third_party/crashpad/crashpad/util/posix/close_stdio.cc b/chromium/third_party/crashpad/crashpad/util/posix/close_stdio.cc index 02bd4a9366f..812aad57218 100644 --- a/chromium/third_party/crashpad/crashpad/util/posix/close_stdio.cc +++ b/chromium/third_party/crashpad/crashpad/util/posix/close_stdio.cc @@ -18,8 +18,8 @@ #include <paths.h> #include <unistd.h> +#include "base/check.h" #include "base/files/scoped_file.h" -#include "base/logging.h" #include "base/macros.h" #include "base/posix/eintr_wrapper.h" diff --git a/chromium/third_party/crashpad/crashpad/util/posix/double_fork_and_exec.cc b/chromium/third_party/crashpad/crashpad/util/posix/double_fork_and_exec.cc index e4ad9988ad3..1960430954d 100644 --- a/chromium/third_party/crashpad/crashpad/util/posix/double_fork_and_exec.cc +++ b/chromium/third_party/crashpad/crashpad/util/posix/double_fork_and_exec.cc @@ -19,6 +19,7 @@ #include <sys/wait.h> #include <unistd.h> +#include "base/check_op.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/strings/stringprintf.h" diff --git a/chromium/third_party/crashpad/crashpad/util/posix/drop_privileges.cc b/chromium/third_party/crashpad/crashpad/util/posix/drop_privileges.cc index 884a411c37a..2dd2c21400c 100644 --- a/chromium/third_party/crashpad/crashpad/util/posix/drop_privileges.cc +++ b/chromium/third_party/crashpad/crashpad/util/posix/drop_privileges.cc @@ -14,7 +14,9 @@ #include <unistd.h> -#include "base/logging.h" +#include <ostream> + +#include "base/check_op.h" #include "build/build_config.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/posix/scoped_mmap.cc b/chromium/third_party/crashpad/crashpad/util/posix/scoped_mmap.cc index fbf47fae04f..c7a1dd2766f 100644 --- a/chromium/third_party/crashpad/crashpad/util/posix/scoped_mmap.cc +++ b/chromium/third_party/crashpad/crashpad/util/posix/scoped_mmap.cc @@ -18,6 +18,7 @@ #include <algorithm> +#include "base/check_op.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/numerics/safe_math.h" diff --git a/chromium/third_party/crashpad/crashpad/util/posix/signals.cc b/chromium/third_party/crashpad/crashpad/util/posix/signals.cc index 53c10389649..7dbe10ebc22 100644 --- a/chromium/third_party/crashpad/crashpad/util/posix/signals.cc +++ b/chromium/third_party/crashpad/crashpad/util/posix/signals.cc @@ -18,6 +18,7 @@ #include <vector> +#include "base/check_op.h" #include "base/logging.h" #include "base/stl_util.h" diff --git a/chromium/third_party/crashpad/crashpad/util/process/process_memory.cc b/chromium/third_party/crashpad/crashpad/util/process/process_memory.cc index ab87b940fa1..b7b417ff7db 100644 --- a/chromium/third_party/crashpad/crashpad/util/process/process_memory.cc +++ b/chromium/third_party/crashpad/crashpad/util/process/process_memory.cc @@ -14,8 +14,11 @@ #include "util/process/process_memory.h" +#include <string.h> + #include <algorithm> +#include "base/check_op.h" #include "base/logging.h" #include "util/numeric/safe_assignment.h" diff --git a/chromium/third_party/crashpad/crashpad/util/process/process_memory_range_test.cc b/chromium/third_party/crashpad/crashpad/util/process/process_memory_range_test.cc index 2df2b5cbe68..a46b4e7d80d 100644 --- a/chromium/third_party/crashpad/crashpad/util/process/process_memory_range_test.cc +++ b/chromium/third_party/crashpad/crashpad/util/process/process_memory_range_test.cc @@ -16,7 +16,6 @@ #include <limits> -#include "base/logging.h" #include "base/stl_util.h" #include "build/build_config.h" #include "gtest/gtest.h" diff --git a/chromium/third_party/crashpad/crashpad/util/stdlib/string_number_conversion.cc b/chromium/third_party/crashpad/crashpad/util/stdlib/string_number_conversion.cc index 64211844d63..4254169aa97 100644 --- a/chromium/third_party/crashpad/crashpad/util/stdlib/string_number_conversion.cc +++ b/chromium/third_party/crashpad/crashpad/util/stdlib/string_number_conversion.cc @@ -22,7 +22,6 @@ #include <limits> -#include "base/logging.h" namespace { diff --git a/chromium/third_party/crashpad/crashpad/util/stdlib/strlcpy.cc b/chromium/third_party/crashpad/crashpad/util/stdlib/strlcpy.cc index be0dfb27c3a..30bd20f82dc 100644 --- a/chromium/third_party/crashpad/crashpad/util/stdlib/strlcpy.cc +++ b/chromium/third_party/crashpad/crashpad/util/stdlib/strlcpy.cc @@ -14,7 +14,7 @@ #include "util/stdlib/strlcpy.h" -#include "base/logging.h" +#include "base/check.h" #include "build/build_config.h" #if defined(OS_WIN) && defined(WCHAR_T_IS_UTF16) diff --git a/chromium/third_party/crashpad/crashpad/util/stream/base94_output_stream.cc b/chromium/third_party/crashpad/crashpad/util/stream/base94_output_stream.cc index a47d774b7a8..7513578c919 100644 --- a/chromium/third_party/crashpad/crashpad/util/stream/base94_output_stream.cc +++ b/chromium/third_party/crashpad/crashpad/util/stream/base94_output_stream.cc @@ -16,6 +16,7 @@ #include <algorithm> +#include "base/check.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" diff --git a/chromium/third_party/crashpad/crashpad/util/stream/file_encoder.cc b/chromium/third_party/crashpad/crashpad/util/stream/file_encoder.cc index bb2c41a39dd..e375cef7f81 100644 --- a/chromium/third_party/crashpad/crashpad/util/stream/file_encoder.cc +++ b/chromium/third_party/crashpad/crashpad/util/stream/file_encoder.cc @@ -16,7 +16,6 @@ #include <memory> -#include "base/logging.h" #include "base/macros.h" #include "util/file/file_io.h" #include "util/file/file_reader.h" diff --git a/chromium/third_party/crashpad/crashpad/util/stream/log_output_stream.cc b/chromium/third_party/crashpad/crashpad/util/stream/log_output_stream.cc index 03c0a5a02db..24987cb5ae8 100644 --- a/chromium/third_party/crashpad/crashpad/util/stream/log_output_stream.cc +++ b/chromium/third_party/crashpad/crashpad/util/stream/log_output_stream.cc @@ -14,8 +14,11 @@ #include "util/stream/log_output_stream.h" +#include <string.h> + #include <algorithm> +#include "base/check.h" #include "base/logging.h" #if defined(OS_ANDROID) diff --git a/chromium/third_party/crashpad/crashpad/util/stream/test_output_stream.cc b/chromium/third_party/crashpad/crashpad/util/stream/test_output_stream.cc index 04ef7007df7..b17825cbcef 100644 --- a/chromium/third_party/crashpad/crashpad/util/stream/test_output_stream.cc +++ b/chromium/third_party/crashpad/crashpad/util/stream/test_output_stream.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "util/stream/test_output_stream.h" -#include "base/logging.h" +#include "base/check.h" namespace crashpad { namespace test { diff --git a/chromium/third_party/crashpad/crashpad/util/synchronization/semaphore_mac.cc b/chromium/third_party/crashpad/crashpad/util/synchronization/semaphore_mac.cc index 4f3bf00a101..a0ef595384f 100644 --- a/chromium/third_party/crashpad/crashpad/util/synchronization/semaphore_mac.cc +++ b/chromium/third_party/crashpad/crashpad/util/synchronization/semaphore_mac.cc @@ -15,8 +15,9 @@ #include "util/synchronization/semaphore.h" #include <cmath> +#include <ostream> -#include "base/logging.h" +#include "base/check_op.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/synchronization/semaphore_posix.cc b/chromium/third_party/crashpad/crashpad/util/synchronization/semaphore_posix.cc index 3875f3f4336..ec5355d75a3 100644 --- a/chromium/third_party/crashpad/crashpad/util/synchronization/semaphore_posix.cc +++ b/chromium/third_party/crashpad/crashpad/util/synchronization/semaphore_posix.cc @@ -20,6 +20,7 @@ #include <chrono> +#include "base/check_op.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "util/misc/time.h" diff --git a/chromium/third_party/crashpad/crashpad/util/synchronization/semaphore_win.cc b/chromium/third_party/crashpad/crashpad/util/synchronization/semaphore_win.cc index 2f26c2379b1..cce81918471 100644 --- a/chromium/third_party/crashpad/crashpad/util/synchronization/semaphore_win.cc +++ b/chromium/third_party/crashpad/crashpad/util/synchronization/semaphore_win.cc @@ -16,8 +16,9 @@ #include <cmath> #include <limits> +#include <ostream> -#include "base/logging.h" +#include "base/check_op.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/thread/thread.cc b/chromium/third_party/crashpad/crashpad/util/thread/thread.cc index 04782bb7978..cc73e9a9ba4 100644 --- a/chromium/third_party/crashpad/crashpad/util/thread/thread.cc +++ b/chromium/third_party/crashpad/crashpad/util/thread/thread.cc @@ -14,7 +14,7 @@ #include "util/thread/thread.h" -#include "base/logging.h" +#include "base/check.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/thread/thread_log_messages.cc b/chromium/third_party/crashpad/crashpad/util/thread/thread_log_messages.cc index 60c824834ac..70680b31c7a 100644 --- a/chromium/third_party/crashpad/crashpad/util/thread/thread_log_messages.cc +++ b/chromium/third_party/crashpad/crashpad/util/thread/thread_log_messages.cc @@ -16,6 +16,7 @@ #include <sys/types.h> +#include "base/check_op.h" #include "base/logging.h" #include "base/threading/thread_local_storage.h" diff --git a/chromium/third_party/crashpad/crashpad/util/thread/thread_posix.cc b/chromium/third_party/crashpad/crashpad/util/thread/thread_posix.cc index 58a98747664..fe50050c7f9 100644 --- a/chromium/third_party/crashpad/crashpad/util/thread/thread_posix.cc +++ b/chromium/third_party/crashpad/crashpad/util/thread/thread_posix.cc @@ -16,7 +16,9 @@ #include <errno.h> -#include "base/logging.h" +#include <ostream> + +#include "base/check.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/thread/thread_win.cc b/chromium/third_party/crashpad/crashpad/util/thread/thread_win.cc index 466dfa9b94c..0132856a855 100644 --- a/chromium/third_party/crashpad/crashpad/util/thread/thread_win.cc +++ b/chromium/third_party/crashpad/crashpad/util/thread/thread_win.cc @@ -14,7 +14,9 @@ #include "util/thread/thread.h" -#include "base/logging.h" +#include <ostream> + +#include "base/check.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/thread/worker_thread.cc b/chromium/third_party/crashpad/crashpad/util/thread/worker_thread.cc index b5dcdb288b1..e83f8f016d7 100644 --- a/chromium/third_party/crashpad/crashpad/util/thread/worker_thread.cc +++ b/chromium/third_party/crashpad/crashpad/util/thread/worker_thread.cc @@ -14,7 +14,7 @@ #include "util/thread/worker_thread.h" -#include "base/logging.h" +#include "base/check.h" #include "util/thread/thread.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/win/command_line_test.cc b/chromium/third_party/crashpad/crashpad/util/win/command_line_test.cc index 032d5555941..82f682c6faa 100644 --- a/chromium/third_party/crashpad/crashpad/util/win/command_line_test.cc +++ b/chromium/third_party/crashpad/crashpad/util/win/command_line_test.cc @@ -18,7 +18,6 @@ #include <shellapi.h> #include <sys/types.h> -#include "base/logging.h" #include "base/scoped_generic.h" #include "base/stl_util.h" #include "gtest/gtest.h" diff --git a/chromium/third_party/crashpad/crashpad/util/win/get_function.cc b/chromium/third_party/crashpad/crashpad/util/win/get_function.cc index d498d30b77d..f370f398dae 100644 --- a/chromium/third_party/crashpad/crashpad/util/win/get_function.cc +++ b/chromium/third_party/crashpad/crashpad/util/win/get_function.cc @@ -14,7 +14,7 @@ #include "util/win/get_function.h" -#include "base/logging.h" +#include "base/check.h" #include "base/strings/utf_string_conversions.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/win/nt_internals.cc b/chromium/third_party/crashpad/crashpad/util/win/nt_internals.cc index df8288a981a..87c6808cea6 100644 --- a/chromium/third_party/crashpad/crashpad/util/win/nt_internals.cc +++ b/chromium/third_party/crashpad/crashpad/util/win/nt_internals.cc @@ -14,7 +14,6 @@ #include "util/win/nt_internals.h" -#include "base/logging.h" #include "util/win/get_function.h" // Declarations that the system headers should provide but don’t. diff --git a/chromium/third_party/crashpad/crashpad/util/win/process_info_test.cc b/chromium/third_party/crashpad/crashpad/util/win/process_info_test.cc index a43358d4b70..75f45dbec31 100644 --- a/chromium/third_party/crashpad/crashpad/util/win/process_info_test.cc +++ b/chromium/third_party/crashpad/crashpad/util/win/process_info_test.cc @@ -21,6 +21,7 @@ #include <memory> #include "base/files/file_path.h" +#include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" diff --git a/chromium/third_party/crashpad/crashpad/util/win/registration_protocol_win_test.cc b/chromium/third_party/crashpad/crashpad/util/win/registration_protocol_win_test.cc index 334d7d83cab..ecbea342e55 100644 --- a/chromium/third_party/crashpad/crashpad/util/win/registration_protocol_win_test.cc +++ b/chromium/third_party/crashpad/crashpad/util/win/registration_protocol_win_test.cc @@ -22,6 +22,7 @@ #include <vector> #include "base/logging.h" +#include "base/notreached.h" #include "base/strings/string16.h" #include "gtest/gtest.h" #include "test/errors.h" diff --git a/chromium/third_party/crashpad/crashpad/util/win/safe_terminate_process_test.cc b/chromium/third_party/crashpad/crashpad/util/win/safe_terminate_process_test.cc index cf1a4925107..f30c649af49 100644 --- a/chromium/third_party/crashpad/crashpad/util/win/safe_terminate_process_test.cc +++ b/chromium/third_party/crashpad/crashpad/util/win/safe_terminate_process_test.cc @@ -19,8 +19,8 @@ #include <string> #include <memory> +#include "base/check.h" #include "base/files/file_path.h" -#include "base/logging.h" #include "base/macros.h" #include "base/stl_util.h" #include "build/build_config.h" diff --git a/chromium/third_party/crashpad/crashpad/util/win/scoped_handle.cc b/chromium/third_party/crashpad/crashpad/util/win/scoped_handle.cc index 5e79e572dc2..c7afb310ba7 100644 --- a/chromium/third_party/crashpad/crashpad/util/win/scoped_handle.cc +++ b/chromium/third_party/crashpad/crashpad/util/win/scoped_handle.cc @@ -14,7 +14,7 @@ #include "util/win/scoped_handle.h" -#include "base/logging.h" +#include "base/check.h" #include "util/file/file_io.h" namespace crashpad { diff --git a/chromium/third_party/crashpad/crashpad/util/win/scoped_set_event.cc b/chromium/third_party/crashpad/crashpad/util/win/scoped_set_event.cc index 7fb16474eef..4a31cdf75c6 100644 --- a/chromium/third_party/crashpad/crashpad/util/win/scoped_set_event.cc +++ b/chromium/third_party/crashpad/crashpad/util/win/scoped_set_event.cc @@ -14,6 +14,7 @@ #include "util/win/scoped_set_event.h" +#include "base/check.h" #include "base/logging.h" namespace crashpad { |