Remove/replace unnecessary includes of logging.h
If the file just needs the CHECK/CHECK_OP/NOTREACHED
macros, use the appropriate header for that instead.
Or if logging.h is not needed at all, remove it.
This is both a nice cleanup (logging.h is a big header,
and including it unnecessarily has compile-time costs),
and part of the final step towards making logging.h no
longer include check.h and the others.
Bug: chromium:1031540
Change-Id: I055aaee1476c6f40e88b1641d40b35aee163392c
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2255361
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
GitOrigin-RevId: 161bfed35ab1cfe3cefc90e28972a1c4d9136bf2
diff --git a/client/annotation.h b/client/annotation.h
index 46cde62..ddfe8f6 100644
--- a/client/annotation.h
+++ b/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/client/annotation_list.cc b/client/annotation_list.cc
index 10f5ea4..f847d7c 100644
--- a/client/annotation_list.cc
+++ b/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/client/crash_report_database.cc b/client/crash_report_database.cc
index eda0ef4..e1559ca 100644
--- a/client/crash_report_database.cc
+++ b/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/client/crashpad_client_linux_test.cc b/client/crashpad_client_linux_test.cc
index 2bfda5a..01cf9f6 100644
--- a/client/crashpad_client_linux_test.cc
+++ b/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/client/crashpad_client_win_test.cc b/client/crashpad_client_win_test.cc
index b950699..f15887b 100644
--- a/client/crashpad_client_win_test.cc
+++ b/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/client/simple_address_range_bag_test.cc b/client/simple_address_range_bag_test.cc
index e9a6d9f..4c3f34d 100644
--- a/client/simple_address_range_bag_test.cc
+++ b/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/client/simple_string_dictionary.h b/client/simple_string_dictionary.h
index 0e97736..31c7548 100644
--- a/client/simple_string_dictionary.h
+++ b/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/client/simple_string_dictionary_test.cc b/client/simple_string_dictionary_test.cc
index cd23216..cc025a1 100644
--- a/client/simple_string_dictionary_test.cc
+++ b/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/handler/linux/exception_handler_server_test.cc b/handler/linux/exception_handler_server_test.cc
index 7da5bab..81687fd 100644
--- a/handler/linux/exception_handler_server_test.cc
+++ b/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/minidump/minidump_crashpad_info_writer.cc b/minidump/minidump_crashpad_info_writer.cc
index 93be421..e84f29b 100644
--- a/minidump/minidump_crashpad_info_writer.cc
+++ b/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/minidump/minidump_exception_writer.cc b/minidump/minidump_exception_writer.cc
index b0e1e62..e1a02da 100644
--- a/minidump/minidump_exception_writer.cc
+++ b/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/minidump/minidump_memory_info_writer.cc b/minidump/minidump_memory_info_writer.cc
index 8b6bdc8..fe09225 100644
--- a/minidump/minidump_memory_info_writer.cc
+++ b/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/minidump/minidump_stream_writer.cc b/minidump/minidump_stream_writer.cc
index 8e5dcb3..3084ffe 100644
--- a/minidump/minidump_stream_writer.cc
+++ b/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/minidump/minidump_system_info_writer.cc b/minidump/minidump_system_info_writer.cc
index 7b4b49d..caec8f8 100644
--- a/minidump/minidump_system_info_writer.cc
+++ b/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/minidump/minidump_thread_id_map.cc b/minidump/minidump_thread_id_map.cc
index 327d12e..3e9e392 100644
--- a/minidump/minidump_thread_id_map.cc
+++ b/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/snapshot/cpu_context.cc b/snapshot/cpu_context.cc
index 6fb8d7e..c75b555 100644
--- a/snapshot/cpu_context.cc
+++ b/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/snapshot/crashpad_types/image_annotation_reader_test.cc b/snapshot/crashpad_types/image_annotation_reader_test.cc
index 63cfcfc..72a637b 100644
--- a/snapshot/crashpad_types/image_annotation_reader_test.cc
+++ b/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/snapshot/elf/elf_image_reader_test.cc b/snapshot/elf/elf_image_reader_test.cc
index cf8f33b..34235a7 100644
--- a/snapshot/elf/elf_image_reader_test.cc
+++ b/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/snapshot/elf/elf_symbol_table_reader.cc b/snapshot/elf/elf_symbol_table_reader.cc
index c2c6abf..5cdf5ba 100644
--- a/snapshot/elf/elf_symbol_table_reader.cc
+++ b/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/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc b/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc
index 1133c4d..6c74ac6 100644
--- a/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc
+++ b/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/snapshot/fuchsia/system_snapshot_fuchsia.cc b/snapshot/fuchsia/system_snapshot_fuchsia.cc
index c108529..36a4e50 100644
--- a/snapshot/fuchsia/system_snapshot_fuchsia.cc
+++ b/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/snapshot/fuchsia/thread_snapshot_fuchsia.cc b/snapshot/fuchsia/thread_snapshot_fuchsia.cc
index 462cdb1..369203a 100644
--- a/snapshot/fuchsia/thread_snapshot_fuchsia.cc
+++ b/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/snapshot/mac/process_reader_mac_test.cc b/snapshot/mac/process_reader_mac_test.cc
index 9325b2c..2d64ff1 100644
--- a/snapshot/mac/process_reader_mac_test.cc
+++ b/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/snapshot/mac/thread_snapshot_mac.cc b/snapshot/mac/thread_snapshot_mac.cc
index 8fbb3e7..ddb4def 100644
--- a/snapshot/mac/thread_snapshot_mac.cc
+++ b/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/snapshot/minidump/minidump_string_reader.cc b/snapshot/minidump/minidump_string_reader.cc
index d642e9d..a149417 100644
--- a/snapshot/minidump/minidump_string_reader.cc
+++ b/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/snapshot/posix/timezone_test.cc b/snapshot/posix/timezone_test.cc
index b4405ba..73c39ba 100644
--- a/snapshot/posix/timezone_test.cc
+++ b/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/snapshot/win/crashpad_snapshot_test_annotations.cc b/snapshot/win/crashpad_snapshot_test_annotations.cc
index 6005f4d..d46c3d7 100644
--- a/snapshot/win/crashpad_snapshot_test_annotations.cc
+++ b/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/snapshot/win/crashpad_snapshot_test_crashing_child.cc b/snapshot/win/crashpad_snapshot_test_crashing_child.cc
index cc1369e..724bd57 100644
--- a/snapshot/win/crashpad_snapshot_test_crashing_child.cc
+++ b/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/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc b/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc
index cc441a4..eeeddf5 100644
--- a/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc
+++ b/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/snapshot/win/crashpad_snapshot_test_extra_memory_ranges.cc b/snapshot/win/crashpad_snapshot_test_extra_memory_ranges.cc
index e6875fd..6a18410 100644
--- a/snapshot/win/crashpad_snapshot_test_extra_memory_ranges.cc
+++ b/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/snapshot/win/thread_snapshot_win.cc b/snapshot/win/thread_snapshot_win.cc
index 02cc63c..c3894a7 100644
--- a/snapshot/win/thread_snapshot_win.cc
+++ b/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/test/ios/cptest_google_test_runner.mm b/test/ios/cptest_google_test_runner.mm
index ae933fc..9ba795e 100644
--- a/test/ios/cptest_google_test_runner.mm
+++ b/test/ios/cptest_google_test_runner.mm
@@ -15,7 +15,7 @@
#import <UIKit/UIKit.h>
#import <XCTest/XCTest.h>
-#include "base/logging.h"
+#include "base/check.h"
#import "test/ios/cptest_google_test_runner_delegate.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/test/ios/google_test_setup.mm b/test/ios/google_test_setup.mm
index 5dfbff5..f49597e 100644
--- a/test/ios/google_test_setup.mm
+++ b/test/ios/google_test_setup.mm
@@ -16,7 +16,7 @@
#import <UIKit/UIKit.h>
-#include "base/logging.h"
+#include "base/check.h"
#include "gtest/gtest.h"
#include "test/ios/cptest_google_test_runner_delegate.h"
diff --git a/test/mac/exception_swallower.cc b/test/mac/exception_swallower.cc
index be530e7..76ca394 100644
--- a/test/mac/exception_swallower.cc
+++ b/test/mac/exception_swallower.cc
@@ -20,7 +20,7 @@
#include <string>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/mac/scoped_mach_port.h"
#include "base/strings/stringprintf.h"
#include "handler/mac/exception_handler_server.h"
diff --git a/test/mac/mach_multiprocess.cc b/test/mac/mach_multiprocess.cc
index 59aa653..eaa6a17 100644
--- a/test/mac/mach_multiprocess.cc
+++ b/test/mac/mach_multiprocess.cc
@@ -21,7 +21,6 @@
#include <string>
#include "base/auto_reset.h"
-#include "base/logging.h"
#include "base/mac/scoped_mach_port.h"
#include "gtest/gtest.h"
#include "test/errors.h"
diff --git a/test/main_arguments.cc b/test/main_arguments.cc
index c28d2fa..95221b2 100644
--- a/test/main_arguments.cc
+++ b/test/main_arguments.cc
@@ -14,7 +14,7 @@
#include "test/main_arguments.h"
-#include "base/logging.h"
+#include "base/check.h"
namespace crashpad {
namespace test {
diff --git a/test/multiprocess_exec.cc b/test/multiprocess_exec.cc
index fb33241..cd9a32c 100644
--- a/test/multiprocess_exec.cc
+++ b/test/multiprocess_exec.cc
@@ -16,11 +16,11 @@
#include <map>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/utf_string_conversions.h"
#include "test/main_arguments.h"
-#include "util/stdlib/map_insert.h"
#include "test/test_paths.h"
+#include "util/stdlib/map_insert.h"
namespace crashpad {
namespace test {
diff --git a/test/multiprocess_exec_win.cc b/test/multiprocess_exec_win.cc
index b75f8f5..7aaa71e 100644
--- a/test/multiprocess_exec_win.cc
+++ b/test/multiprocess_exec_win.cc
@@ -16,7 +16,7 @@
#include <sys/types.h>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/utf_string_conversions.h"
#include "gtest/gtest.h"
#include "util/win/command_line.h"
diff --git a/test/multiprocess_posix.cc b/test/multiprocess_posix.cc
index fac329e..984def6 100644
--- a/test/multiprocess_posix.cc
+++ b/test/multiprocess_posix.cc
@@ -23,8 +23,8 @@
#include <string>
#include "base/auto_reset.h"
+#include "base/check_op.h"
#include "base/files/scoped_file.h"
-#include "base/logging.h"
#include "base/posix/eintr_wrapper.h"
#include "base/strings/stringprintf.h"
#include "build/build_config.h"
diff --git a/test/scoped_guarded_page_posix.cc b/test/scoped_guarded_page_posix.cc
index 750fe18..b2a3bea 100644
--- a/test/scoped_guarded_page_posix.cc
+++ b/test/scoped_guarded_page_posix.cc
@@ -16,7 +16,7 @@
#include <sys/mman.h>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/process/process_metrics.h"
namespace crashpad {
diff --git a/test/scoped_guarded_page_win.cc b/test/scoped_guarded_page_win.cc
index 23a6897..6355965 100644
--- a/test/scoped_guarded_page_win.cc
+++ b/test/scoped_guarded_page_win.cc
@@ -16,7 +16,7 @@
#include <windows.h>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/process/process_metrics.h"
namespace crashpad {
diff --git a/test/scoped_temp_dir_posix.cc b/test/scoped_temp_dir_posix.cc
index 7c93090..f8a1676 100644
--- a/test/scoped_temp_dir_posix.cc
+++ b/test/scoped_temp_dir_posix.cc
@@ -19,7 +19,7 @@
#include <string.h>
#include <unistd.h>
-#include "base/logging.h"
+#include "base/check.h"
#include "build/build_config.h"
#include "gtest/gtest.h"
#include "test/errors.h"
diff --git a/test/scoped_temp_dir_win.cc b/test/scoped_temp_dir_win.cc
index 8031921..499f1ef 100644
--- a/test/scoped_temp_dir_win.cc
+++ b/test/scoped_temp_dir_win.cc
@@ -16,12 +16,12 @@
#include <windows.h>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/string16.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
-#include "util/misc/random_string.h"
#include "gtest/gtest.h"
+#include "util/misc/random_string.h"
namespace crashpad {
namespace test {
diff --git a/test/win/win_multiprocess.cc b/test/win/win_multiprocess.cc
index dce171c..2a17299 100644
--- a/test/win/win_multiprocess.cc
+++ b/test/win/win_multiprocess.cc
@@ -16,7 +16,7 @@
#include <shellapi.h>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/scoped_generic.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/tools/crashpad_database_util.cc b/tools/crashpad_database_util.cc
index a003616..176b8c7 100644
--- a/tools/crashpad_database_util.cc
+++ b/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/util/file/delimited_file_reader.cc b/util/file/delimited_file_reader.cc
index 2275ade..e96b1b0 100644
--- a/util/file/delimited_file_reader.cc
+++ b/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/util/file/directory_reader_test.cc b/util/file/directory_reader_test.cc
index 812deaf..5d09c6f 100644
--- a/util/file/directory_reader_test.cc
+++ b/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/util/file/filesystem_test.cc b/util/file/filesystem_test.cc
index 37a9290..e1f6686 100644
--- a/util/file/filesystem_test.cc
+++ b/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/util/linux/proc_stat_reader_test.cc b/util/linux/proc_stat_reader_test.cc
index 01b9afd..1c0c0ae 100644
--- a/util/linux/proc_stat_reader_test.cc
+++ b/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/util/linux/proc_task_reader_test.cc b/util/linux/proc_task_reader_test.cc
index 911f6d3..a93b2d4 100644
--- a/util/linux/proc_task_reader_test.cc
+++ b/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/util/linux/ptrace_broker.cc b/util/linux/ptrace_broker.cc
index 155a1e0..b6b5bb1 100644
--- a/util/linux/ptrace_broker.cc
+++ b/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/util/linux/socket_test.cc b/util/linux/socket_test.cc
index 4e583ae..d73ec0b 100644
--- a/util/linux/socket_test.cc
+++ b/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/util/mach/child_port_server.cc b/util/mach/child_port_server.cc
index aa7a1b8..ce425a8 100644
--- a/util/mach/child_port_server.cc
+++ b/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/util/mach/composite_mach_message_server.cc b/util/mach/composite_mach_message_server.cc
index 44afc35..6b95500 100644
--- a/util/mach/composite_mach_message_server.cc
+++ b/util/mach/composite_mach_message_server.cc
@@ -18,7 +18,7 @@
#include <ostream>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "util/mach/mach_message.h"
namespace crashpad {
diff --git a/util/mach/exc_client_variants.cc b/util/mach/exc_client_variants.cc
index e7945b2..9b87774 100644
--- a/util/mach/exc_client_variants.cc
+++ b/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/util/mach/exc_server_variants.cc b/util/mach/exc_server_variants.cc
index c272ae7..e4c2d19 100644
--- a/util/mach/exc_server_variants.cc
+++ b/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/util/mach/exception_ports_test.cc b/util/mach/exception_ports_test.cc
index c72dec9..6dbc04e 100644
--- a/util/mach/exception_ports_test.cc
+++ b/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/util/mach/notify_server.cc b/util/mach/notify_server.cc
index b9da795..df47327 100644
--- a/util/mach/notify_server.cc
+++ b/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/util/misc/capture_context_test_util_fuchsia.cc b/util/misc/capture_context_test_util_fuchsia.cc
index 7f9210e..3d2a180 100644
--- a/util/misc/capture_context_test_util_fuchsia.cc
+++ b/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/util/misc/capture_context_test_util_linux.cc b/util/misc/capture_context_test_util_linux.cc
index 9fc5db2..30a2ab2 100644
--- a/util/misc/capture_context_test_util_linux.cc
+++ b/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/util/misc/clock_test.cc b/util/misc/clock_test.cc
index 6bfb87b..b1740b8 100644
--- a/util/misc/clock_test.cc
+++ b/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/util/misc/initialization_state_dcheck.h b/util/misc/initialization_state_dcheck.h
index 7b6df98..9fcfc76 100644
--- a/util/misc/initialization_state_dcheck.h
+++ b/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/util/misc/initialization_state_dcheck_test.cc b/util/misc/initialization_state_dcheck_test.cc
index f954d00..3e823c8 100644
--- a/util/misc/initialization_state_dcheck_test.cc
+++ b/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/util/misc/paths_fuchsia.cc b/util/misc/paths_fuchsia.cc
index 6dea633..4ee88f9 100644
--- a/util/misc/paths_fuchsia.cc
+++ b/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/util/misc/time_win.cc b/util/misc/time_win.cc
index d9c4156..acadd79 100644
--- a/util/misc/time_win.cc
+++ b/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/util/misc/uuid.cc b/util/misc/uuid.cc
index ffd4970..5655bc2 100644
--- a/util/misc/uuid.cc
+++ b/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/util/net/http_body.cc b/util/net/http_body.cc
index 7abe3a4..4acacea 100644
--- a/util/net/http_body.cc
+++ b/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/util/net/http_multipart_builder.cc b/util/net/http_multipart_builder.cc
index dda46aa..9ad7c90 100644
--- a/util/net/http_multipart_builder.cc
+++ b/util/net/http_multipart_builder.cc
@@ -20,7 +20,7 @@
#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/util/net/http_transport_test.cc b/util/net/http_transport_test.cc
index 14d1a80..a2a2e39 100644
--- a/util/net/http_transport_test.cc
+++ b/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/util/numeric/checked_range.h b/util/numeric/checked_range.h
index 09dfc22..dbf7191 100644
--- a/util/numeric/checked_range.h
+++ b/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/util/posix/close_stdio.cc b/util/posix/close_stdio.cc
index 02bd4a9..812aad5 100644
--- a/util/posix/close_stdio.cc
+++ b/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/util/process/process_memory_range_test.cc b/util/process/process_memory_range_test.cc
index 2df2b5c..a46b4e7 100644
--- a/util/process/process_memory_range_test.cc
+++ b/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/util/stdlib/string_number_conversion.cc b/util/stdlib/string_number_conversion.cc
index 6421184..4254169 100644
--- a/util/stdlib/string_number_conversion.cc
+++ b/util/stdlib/string_number_conversion.cc
@@ -22,7 +22,6 @@
#include <limits>
-#include "base/logging.h"
namespace {
diff --git a/util/stdlib/strlcpy.cc b/util/stdlib/strlcpy.cc
index be0dfb2..30bd20f 100644
--- a/util/stdlib/strlcpy.cc
+++ b/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/util/stream/file_encoder.cc b/util/stream/file_encoder.cc
index bb2c41a..e375cef 100644
--- a/util/stream/file_encoder.cc
+++ b/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/util/stream/test_output_stream.cc b/util/stream/test_output_stream.cc
index 04ef700..b17825c 100644
--- a/util/stream/test_output_stream.cc
+++ b/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/util/synchronization/semaphore_mac.cc b/util/synchronization/semaphore_mac.cc
index f2ed0cc..a0ef595 100644
--- a/util/synchronization/semaphore_mac.cc
+++ b/util/synchronization/semaphore_mac.cc
@@ -17,7 +17,7 @@
#include <cmath>
#include <ostream>
-#include "base/logging.h"
+#include "base/check_op.h"
namespace crashpad {
diff --git a/util/synchronization/semaphore_win.cc b/util/synchronization/semaphore_win.cc
index ffa9fd0..cce8191 100644
--- a/util/synchronization/semaphore_win.cc
+++ b/util/synchronization/semaphore_win.cc
@@ -18,7 +18,7 @@
#include <limits>
#include <ostream>
-#include "base/logging.h"
+#include "base/check_op.h"
namespace crashpad {
diff --git a/util/thread/thread.cc b/util/thread/thread.cc
index 04782bb..cc73e9a 100644
--- a/util/thread/thread.cc
+++ b/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/util/thread/thread_log_messages.cc b/util/thread/thread_log_messages.cc
index 60c8248..70680b3 100644
--- a/util/thread/thread_log_messages.cc
+++ b/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/util/thread/worker_thread.cc b/util/thread/worker_thread.cc
index b5dcdb2..e83f8f0 100644
--- a/util/thread/worker_thread.cc
+++ b/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/util/win/command_line_test.cc b/util/win/command_line_test.cc
index 032d555..82f682c 100644
--- a/util/win/command_line_test.cc
+++ b/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/util/win/get_function.cc b/util/win/get_function.cc
index d498d30..f370f39 100644
--- a/util/win/get_function.cc
+++ b/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/util/win/nt_internals.cc b/util/win/nt_internals.cc
index df8288a..87c6808 100644
--- a/util/win/nt_internals.cc
+++ b/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/util/win/safe_terminate_process_test.cc b/util/win/safe_terminate_process_test.cc
index cf1a492..f30c649 100644
--- a/util/win/safe_terminate_process_test.cc
+++ b/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/util/win/scoped_handle.cc b/util/win/scoped_handle.cc
index 5e79e57..c7afb31 100644
--- a/util/win/scoped_handle.cc
+++ b/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 {
