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: Ia46806bd95fe498bcf3cf6d2c13ffa4081678043
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>

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"

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 {

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 {

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"

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"

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"
 

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"

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"
 

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"

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"

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"

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"
 

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 {

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"

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"
 

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"

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"

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"

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 {

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 {

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"

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 {

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"

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"
 

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"
 

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"

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"

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"

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"

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"
 

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 {

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)

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"
 

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"

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"

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 {

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 {

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"

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"

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 {

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 {

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"

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 {

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"

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"

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"
 

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"

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"

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"

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"

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"
 

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"

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"

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 {

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"
 

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"

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"

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"

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"
 

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"
 

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"

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"

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"

util/misc/paths_fuchsia.cc

@@ -18,7 +18,6 @@
 #include <zircon/process.h>
 #include <zircon/syscalls.h>
 
-#include "base/logging.h"
 
 namespace crashpad {
 

util/misc/time_win.cc

@@ -16,7 +16,7 @@
 
 #include <stdint.h>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 namespace 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"

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 {

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"

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"

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"

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"
 

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"

util/stdlib/string_number_conversion.cc

@@ -22,7 +22,6 @@
 
 #include <limits>
 
-#include "base/logging.h"
 
 namespace {
 

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)

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"

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 {

util/synchronization/semaphore_mac.cc

@@ -17,7 +17,7 @@
 #include <cmath>
 #include <ostream>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 namespace crashpad {
 

util/synchronization/semaphore_win.cc

@@ -18,7 +18,7 @@
 #include <limits>
 #include <ostream>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 namespace crashpad {
 

util/thread/thread.cc

@@ -14,7 +14,7 @@
 
 #include "util/thread/thread.h"
 
-#include "base/logging.h"
+#include "base/check.h"
 
 namespace 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"
 

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 {

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"

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 {

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.

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"

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 {