From c3cffa634ce1fd84baaab5ba507e240b8abbd977 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Mon, 27 Apr 2020 10:09:12 +0000 Subject: [PATCH] Remove/replace unnecessary logging.h includes in .cc files (base) CHECK, CHECK_EQ etc., and NOTREACHED/NOTIMPLEMENTED have moved to the much smaller headers check.h, check_op.h, and notreached.h, respectively. This CL updates .cc files to use those headers instead when possible, with the purpose of saving compile time. (Split out from https://crrev.com/c/2164525 which also has notes on how the change was generated.) Bug: 1031540 Change-Id: I39ecaaf0d0770f1048c7f2ce2c43f98ec9212565 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2164633 Commit-Queue: Hans Wennborg Auto-Submit: Hans Wennborg Reviewed-by: kylechar Reviewed-by: Matthew Denton Cr-Commit-Position: refs/heads/master@{#762782} --- base/allocator/allocator_extension.cc | 2 +- base/allocator/allocator_shim.cc | 2 +- base/allocator/allocator_shim_default_dispatch_to_winheap.cc | 4 +++- .../partition_allocator/address_space_randomization.cc | 2 +- .../address_space_randomization_unittest.cc | 2 +- base/allocator/partition_allocator/oom_callback.cc | 2 +- base/allocator/partition_allocator/page_allocator.cc | 2 +- base/allocator/partition_allocator/partition_alloc.cc | 2 +- base/allocator/partition_allocator/partition_bucket.cc | 2 +- base/allocator/partition_allocator/partition_page.cc | 2 +- base/allocator/partition_allocator/random.cc | 1 - base/allocator/tcmalloc_unittest.cc | 2 +- base/allocator/winheap_stubs_win.cc | 2 +- base/allocator/winheap_stubs_win_unittest.cc | 2 +- base/android/android_hardware_buffer_compat.cc | 2 +- base/android/application_status_listener_unittest.cc | 1 - base/android/build_info.cc | 3 ++- base/android/bundle_utils.cc | 3 ++- base/android/command_line_android.cc | 1 - base/android/jni_array.cc | 2 +- base/android/jni_weak_ref.cc | 1 - base/android/library_loader/anchor_functions.cc | 1 - base/android/reached_addresses_bitset.cc | 2 +- base/android/scoped_java_ref.cc | 2 +- base/at_exit.cc | 3 ++- base/base64_encode_fuzzer.cc | 2 +- base/base_paths_android.cc | 2 +- base/build_time.cc | 2 +- base/callback_internal.cc | 3 ++- base/callback_unittest.cc | 2 +- base/check_example.cc | 4 +++- base/containers/intrusive_heap.cc | 2 +- base/containers/intrusive_heap_unittest.cc | 3 ++- base/debug/activity_analyzer.cc | 2 +- base/debug/asan_invalid_access.cc | 2 +- base/debug/debugger_posix.cc | 3 ++- base/debug/dump_without_crashing.cc | 2 +- base/debug/invalid_access_win.cc | 2 +- base/debug/stack_trace.cc | 2 +- base/deferred_sequenced_task_runner.cc | 2 +- base/file_version_info_win.cc | 2 +- base/files/dir_reader_posix_unittest.cc | 2 +- base/files/file.cc | 3 ++- base/files/file_enumerator_win.cc | 3 ++- base/files/file_path.cc | 2 +- base/files/file_path_watcher.cc | 2 +- base/files/file_path_watcher_fsevents.cc | 2 +- base/files/file_posix.cc | 3 ++- base/files/file_util.cc | 2 +- base/files/file_win.cc | 3 ++- base/files/important_file_writer_unittest.cc | 2 +- base/files/scoped_file.cc | 2 +- base/fuchsia/default_context.cc | 1 - base/fuchsia/default_job.cc | 2 +- base/fuchsia/intl_profile_watcher_unittest.cc | 2 +- base/hash/hash.cc | 3 ++- base/i18n/break_iterator.cc | 3 ++- base/i18n/char_iterator.cc | 2 +- base/i18n/file_util_icu.cc | 2 +- base/i18n/icu_string_conversions.cc | 3 ++- base/i18n/icu_string_conversions_unittest.cc | 2 +- base/i18n/number_formatting.cc | 2 +- base/i18n/streaming_utf8_validator.cc | 2 +- base/i18n/string_compare.cc | 2 +- base/i18n/string_search.cc | 1 - base/json/json_file_value_serializer.cc | 3 ++- base/json/json_parser.cc | 2 +- base/json/json_reader.cc | 2 +- base/json/json_string_value_serializer.cc | 1 - base/memory/discardable_memory_allocator.cc | 2 +- base/memory/memory_pressure_monitor.cc | 3 ++- base/memory/platform_shared_memory_region_unittest.cc | 2 +- base/memory/ref_counted_memory.cc | 2 +- base/message_loop/message_loop.cc | 2 +- base/message_loop/message_pump.cc | 3 ++- base/message_loop/message_pump_android.cc | 3 ++- base/metrics/bucket_ranges.cc | 1 - base/metrics/dummy_histogram.cc | 2 +- base/metrics/histogram_base.cc | 3 ++- base/metrics/metrics_hashes.cc | 2 +- base/metrics/persistent_histogram_allocator_unittest.cc | 1 - base/metrics/persistent_sample_map.cc | 3 ++- base/metrics/sample_map.cc | 2 +- base/metrics/sample_vector.cc | 3 ++- base/metrics/ukm_source_id.cc | 2 +- base/native_library_fuchsia.cc | 2 +- base/no_destructor_unittest.cc | 2 +- base/observer_list_perftest.cc | 2 +- base/path_service.cc | 2 +- base/power_monitor/power_monitor_device_source_stub.cc | 2 +- base/process/process_handle.cc | 2 +- base/process/process_iterator_fuchsia.cc | 2 +- base/process/process_linux.cc | 3 ++- base/process/process_metrics.cc | 3 ++- base/process/process_metrics_ios.cc | 3 ++- base/profiler/native_unwinder_mac.cc | 3 ++- base/profiler/native_unwinder_win.cc | 3 ++- base/profiler/stack_sampler_impl.cc | 2 +- base/profiler/suspendable_thread_delegate_mac.cc | 2 +- base/profiler/suspendable_thread_delegate_win.cc | 2 +- base/rand_util.cc | 2 +- base/rand_util_nacl.cc | 2 +- base/rand_util_posix.cc | 2 +- base/rand_util_win.cc | 2 +- base/scoped_clear_last_error_unittest.cc | 2 +- base/security_unittest.cc | 1 - base/sequence_checker_impl.cc | 2 +- base/sequence_token.cc | 2 +- base/strings/safe_sprintf.cc | 2 +- base/strings/safe_sprintf_unittest.cc | 2 +- base/strings/string_number_conversions.cc | 2 +- base/strings/string_piece.cc | 1 - base/strings/utf_offset_string_conversions.cc | 2 +- base/strings/utf_offset_string_conversions_unittest.cc | 1 - base/strings/utf_string_conversions_unittest.cc | 1 - base/sync_socket_nacl.cc | 2 +- base/sync_socket_posix.cc | 2 +- base/synchronization/atomic_flag.cc | 2 +- base/synchronization/atomic_flag_unittest.cc | 2 +- base/synchronization/lock_impl_posix.cc | 2 +- base/synchronization/waitable_event_posix.cc | 2 +- base/synchronization/waitable_event_watcher_posix.cc | 2 +- base/system/sys_info.cc | 2 +- base/system/sys_info_chromeos.cc | 2 +- base/system/sys_info_freebsd.cc | 2 +- base/system/sys_info_linux.cc | 3 ++- base/system/sys_info_openbsd.cc | 2 +- base/system/sys_info_posix.cc | 2 +- base/system/sys_info_win.cc | 3 ++- base/task/cancelable_task_tracker_unittest.cc | 2 +- base/task/common/checked_lock_impl.cc | 2 +- base/task/common/operations_controller.cc | 2 +- base/task/lazy_thread_pool_task_runner.cc | 2 +- base/task/post_task.cc | 2 +- base/task/scoped_set_task_priority_for_current_thread.cc | 2 +- base/task/sequence_manager/atomic_flag_set.cc | 2 +- base/task/sequence_manager/task_queue_selector.cc | 2 +- base/task/sequence_manager/test/mock_time_message_pump.cc | 2 +- base/task/sequence_manager/work_deduplicator.cc | 2 +- base/task/sequence_manager/work_queue_sets.cc | 2 +- base/task/task_traits.cc | 2 +- base/task/thread_pool.cc | 2 +- base/task/thread_pool/delayed_task_manager.cc | 2 +- base/task/thread_pool/job_task_source.cc | 2 +- base/task/thread_pool/priority_queue.cc | 2 +- base/task/thread_pool/sequence.cc | 2 +- base/task/thread_pool/task_source.cc | 2 +- base/task/thread_pool/task_tracker_unittest.cc | 2 +- base/task/thread_pool/test_task_factory.cc | 2 +- base/task/thread_pool/thread_pool_instance.cc | 2 +- base/task/thread_pool/worker_thread.cc | 2 +- base/task/thread_pool/worker_thread_stack.cc | 2 +- base/task/thread_pool/worker_thread_stack_unittest.cc | 2 +- base/task_runner.cc | 2 +- base/test/fontconfig_util_linux.cc | 2 +- base/test/gtest_xml_unittest_result_printer.cc | 2 +- base/test/gtest_xml_util.cc | 2 +- base/test/launcher/test_result.cc | 3 ++- base/test/multiprocess_test_android.cc | 2 +- base/test/perf_log.cc | 2 +- base/test/scoped_mock_time_message_loop_task_runner.cc | 2 +- base/test/scoped_path_override.cc | 2 +- base/test/simple_test_tick_clock.cc | 2 +- base/test/test_discardable_memory_allocator.cc | 2 +- base/test/test_file_util_linux.cc | 2 +- base/test/test_file_util_posix.cc | 3 ++- base/test/test_file_util_win.cc | 3 ++- base/test/test_io_thread.cc | 2 +- base/test/test_message_loop.cc | 2 +- base/test/test_mock_time_task_runner.cc | 2 +- base/test/test_reg_util_win.cc | 1 - base/test/test_simple_task_runner.cc | 2 +- base/threading/platform_thread_internal_posix.cc | 2 +- base/threading/post_task_and_reply_impl.cc | 2 +- base/threading/scoped_blocking_call_internal.cc | 2 +- base/threading/sequence_local_storage_map.cc | 2 +- base/threading/sequence_local_storage_slot.cc | 2 +- base/threading/sequenced_task_runner_handle.cc | 2 +- base/threading/simple_thread.cc | 2 +- base/threading/thread_checker_impl.cc | 2 +- base/threading/thread_collision_warner.cc | 2 +- base/threading/thread_id_name_manager.cc | 2 +- base/threading/thread_local_storage.cc | 3 ++- base/threading/thread_local_storage_posix.cc | 2 +- base/threading/thread_local_storage_win.cc | 2 +- base/threading/thread_local_unittest.cc | 2 +- base/threading/thread_restrictions.cc | 2 +- base/threading/thread_task_runner_handle.cc | 2 +- base/time/time_conversion_posix.cc | 2 +- base/time/time_exploded_icu.cc | 2 +- base/time/time_now_posix.cc | 3 ++- base/time/time_unittest.cc | 2 +- base/time/time_win.cc | 3 ++- base/timer/lap_timer.cc | 2 +- base/timer/timer.cc | 2 +- base/trace_event/category_registry.cc | 3 ++- base/trace_event/heap_profiler_allocation_context_tracker.cc | 3 ++- base/trace_event/memory_dump_request_args.cc | 2 +- base/trace_event/memory_dump_scheduler.cc | 2 +- base/trace_event/trace_arguments.cc | 3 ++- base/trace_event/trace_event_etw_export_win.cc | 2 +- base/trace_event/trace_event_filter_test_utils.cc | 2 +- .../memory_pressure/multi_source_memory_pressure_monitor.cc | 2 +- .../memory_pressure/system_memory_pressure_evaluator_mac.cc | 2 +- base/values.cc | 3 ++- base/version.cc | 2 +- base/vlog_unittest.cc | 1 - base/win/embedded_i18n/language_selector.cc | 2 +- base/win/enum_variant.cc | 2 +- base/win/event_trace_controller.cc | 2 +- base/win/hstring_reference.cc | 2 +- base/win/i18n.cc | 2 +- base/win/iat_patch_function.cc | 3 ++- base/win/patch_util.cc | 2 +- base/win/registry.cc | 3 ++- base/win/resource_util.cc | 2 +- base/win/scoped_bstr.cc | 2 +- base/win/scoped_com_initializer.cc | 2 +- base/win/scoped_hstring.cc | 3 ++- base/win/scoped_winrt_initializer.cc | 2 +- base/win/startup_information.cc | 1 - base/win/windows_version.cc | 3 ++- base/win/windows_version_unittest.cc | 2 +- base/win/wrapped_window_proc.cc | 3 ++- 224 files changed, 253 insertions(+), 224 deletions(-) diff --git a/base/allocator/allocator_extension.cc b/base/allocator/allocator_extension.cc index 87dd5731c06368..72ae582a0f33ae 100644 --- a/base/allocator/allocator_extension.cc +++ b/base/allocator/allocator_extension.cc @@ -4,7 +4,7 @@ #include "base/allocator/allocator_extension.h" #include "base/allocator/buildflags.h" -#include "base/logging.h" +#include "base/check.h" #if BUILDFLAG(USE_TCMALLOC) #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc index ef42d5ad67fa3d..320bca7e168207 100644 --- a/base/allocator/allocator_shim.cc +++ b/base/allocator/allocator_shim.cc @@ -12,7 +12,7 @@ #include "base/allocator/buildflags.h" #include "base/atomicops.h" #include "base/bits.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/macros.h" #include "base/process/process_metrics.h" #include "base/threading/platform_thread.h" diff --git a/base/allocator/allocator_shim_default_dispatch_to_winheap.cc b/base/allocator/allocator_shim_default_dispatch_to_winheap.cc index f36c6f0c8ea814..7af1f4d66c2867 100644 --- a/base/allocator/allocator_shim_default_dispatch_to_winheap.cc +++ b/base/allocator/allocator_shim_default_dispatch_to_winheap.cc @@ -4,8 +4,10 @@ #include "base/allocator/allocator_shim.h" +#include + #include "base/allocator/winheap_stubs_win.h" -#include "base/logging.h" +#include "base/check.h" namespace { diff --git a/base/allocator/partition_allocator/address_space_randomization.cc b/base/allocator/partition_allocator/address_space_randomization.cc index 625718bfc445ba..72078fdaa50456 100644 --- a/base/allocator/partition_allocator/address_space_randomization.cc +++ b/base/allocator/partition_allocator/address_space_randomization.cc @@ -7,7 +7,7 @@ #include "base/allocator/partition_allocator/page_allocator.h" #include "base/allocator/partition_allocator/random.h" #include "base/allocator/partition_allocator/spin_lock.h" -#include "base/logging.h" +#include "base/check_op.h" #include "build/build_config.h" #if defined(OS_WIN) diff --git a/base/allocator/partition_allocator/address_space_randomization_unittest.cc b/base/allocator/partition_allocator/address_space_randomization_unittest.cc index 34e6a5d65ed166..081ce4591da411 100644 --- a/base/allocator/partition_allocator/address_space_randomization_unittest.cc +++ b/base/allocator/partition_allocator/address_space_randomization_unittest.cc @@ -8,7 +8,7 @@ #include "base/allocator/partition_allocator/page_allocator.h" #include "base/allocator/partition_allocator/random.h" -#include "base/logging.h" +#include "base/check_op.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/allocator/partition_allocator/oom_callback.cc b/base/allocator/partition_allocator/oom_callback.cc index 2e22e109016c09..c734458acbbb98 100644 --- a/base/allocator/partition_allocator/oom_callback.cc +++ b/base/allocator/partition_allocator/oom_callback.cc @@ -4,7 +4,7 @@ #include "base/allocator/partition_allocator/oom_callback.h" -#include "base/logging.h" +#include "base/check.h" namespace base { diff --git a/base/allocator/partition_allocator/page_allocator.cc b/base/allocator/partition_allocator/page_allocator.cc index 28d90fe9b8f073..b7785505efcb0a 100644 --- a/base/allocator/partition_allocator/page_allocator.cc +++ b/base/allocator/partition_allocator/page_allocator.cc @@ -12,7 +12,7 @@ #include "base/allocator/partition_allocator/page_allocator_internal.h" #include "base/allocator/partition_allocator/spin_lock.h" #include "base/bits.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/no_destructor.h" #include "base/numerics/checked_math.h" #include "build/build_config.h" diff --git a/base/allocator/partition_allocator/partition_alloc.cc b/base/allocator/partition_allocator/partition_alloc.cc index 208b101bf246ec..a186840ffe3bd6 100644 --- a/base/allocator/partition_allocator/partition_alloc.cc +++ b/base/allocator/partition_allocator/partition_alloc.cc @@ -13,7 +13,7 @@ #include "base/allocator/partition_allocator/partition_oom.h" #include "base/allocator/partition_allocator/partition_page.h" #include "base/allocator/partition_allocator/spin_lock.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/no_destructor.h" #include "base/synchronization/lock.h" diff --git a/base/allocator/partition_allocator/partition_bucket.cc b/base/allocator/partition_allocator/partition_bucket.cc index cf2d9f22b20264..a52efccbf6ace3 100644 --- a/base/allocator/partition_allocator/partition_bucket.cc +++ b/base/allocator/partition_allocator/partition_bucket.cc @@ -11,7 +11,7 @@ #include "base/allocator/partition_allocator/partition_oom.h" #include "base/allocator/partition_allocator/partition_page.h" #include "base/allocator/partition_allocator/partition_root_base.h" -#include "base/logging.h" +#include "base/check.h" #include "build/build_config.h" namespace base { diff --git a/base/allocator/partition_allocator/partition_page.cc b/base/allocator/partition_allocator/partition_page.cc index 3008cfa4b085b8..b094abc05b6b9d 100644 --- a/base/allocator/partition_allocator/partition_page.cc +++ b/base/allocator/partition_allocator/partition_page.cc @@ -6,7 +6,7 @@ #include "base/allocator/partition_allocator/partition_direct_map_extent.h" #include "base/allocator/partition_allocator/partition_root_base.h" -#include "base/logging.h" +#include "base/check.h" namespace base { namespace internal { diff --git a/base/allocator/partition_allocator/random.cc b/base/allocator/partition_allocator/random.cc index 7da12ddb1edcfe..14ecc168a5fd68 100644 --- a/base/allocator/partition_allocator/random.cc +++ b/base/allocator/partition_allocator/random.cc @@ -5,7 +5,6 @@ #include "base/allocator/partition_allocator/random.h" #include "base/allocator/partition_allocator/spin_lock.h" -#include "base/logging.h" #include "base/no_destructor.h" #include "base/rand_util.h" #include "base/synchronization/lock.h" diff --git a/base/allocator/tcmalloc_unittest.cc b/base/allocator/tcmalloc_unittest.cc index bd3ab177379e4a..7a0a0c2808dea8 100644 --- a/base/allocator/tcmalloc_unittest.cc +++ b/base/allocator/tcmalloc_unittest.cc @@ -6,8 +6,8 @@ #include #include "base/allocator/buildflags.h" +#include "base/check_op.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "base/process/process_metrics.h" #include "base/system/sys_info.h" #include "build/build_config.h" diff --git a/base/allocator/winheap_stubs_win.cc b/base/allocator/winheap_stubs_win.cc index 2ba8fe96aa5594..cc08cf94b9f09c 100644 --- a/base/allocator/winheap_stubs_win.cc +++ b/base/allocator/winheap_stubs_win.cc @@ -16,7 +16,7 @@ #include #include "base/bits.h" -#include "base/logging.h" +#include "base/check_op.h" namespace base { namespace allocator { diff --git a/base/allocator/winheap_stubs_win_unittest.cc b/base/allocator/winheap_stubs_win_unittest.cc index 369bc1b932a089..cb641d746b2f69 100644 --- a/base/allocator/winheap_stubs_win_unittest.cc +++ b/base/allocator/winheap_stubs_win_unittest.cc @@ -5,7 +5,7 @@ #include "base/allocator/winheap_stubs_win.h" #include "base/bits.h" -#include "base/logging.h" +#include "base/check.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/android/android_hardware_buffer_compat.cc b/base/android/android_hardware_buffer_compat.cc index 5977879ff47b11..0f9dd0bda885e5 100644 --- a/base/android/android_hardware_buffer_compat.cc +++ b/base/android/android_hardware_buffer_compat.cc @@ -7,7 +7,7 @@ #include #include "base/android/build_info.h" -#include "base/logging.h" +#include "base/check.h" namespace base { diff --git a/base/android/application_status_listener_unittest.cc b/base/android/application_status_listener_unittest.cc index c5d939519bdf72..4ce74ded40e387 100644 --- a/base/android/application_status_listener_unittest.cc +++ b/base/android/application_status_listener_unittest.cc @@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/callback_forward.h" -#include "base/logging.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/test/task_environment.h" diff --git a/base/android/build_info.cc b/base/android/build_info.cc index 73509fb024ce4a..2f598707564924 100644 --- a/base/android/build_info.cc +++ b/base/android/build_info.cc @@ -10,8 +10,9 @@ #include "base/android/jni_array.h" #include "base/android/scoped_java_ref.h" #include "base/base_jni_headers/BuildInfo_jni.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/memory/singleton.h" +#include "base/notreached.h" #include "base/strings/string_number_conversions.h" namespace base { diff --git a/base/android/bundle_utils.cc b/base/android/bundle_utils.cc index d227b7c9567dfa..7558b17b8d0f1b 100644 --- a/base/android/bundle_utils.cc +++ b/base/android/bundle_utils.cc @@ -10,8 +10,9 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/base_jni_headers/BundleUtils_jni.h" +#include "base/check.h" #include "base/files/file_path.h" -#include "base/logging.h" +#include "base/notreached.h" // These symbols are added by the lld linker when creating a partitioned shared // library. The symbols live in the base library, and are used to properly load diff --git a/base/android/command_line_android.cc b/base/android/command_line_android.cc index 689ad89bca4e36..cd236e08e7f15e 100644 --- a/base/android/command_line_android.cc +++ b/base/android/command_line_android.cc @@ -6,7 +6,6 @@ #include "base/android/jni_string.h" #include "base/base_jni_headers/CommandLine_jni.h" #include "base/command_line.h" -#include "base/logging.h" using base::android::ConvertUTF8ToJavaString; using base::android::ConvertJavaStringToUTF8; diff --git a/base/android/jni_array.cc b/base/android/jni_array.cc index 44ddb907b38181..419269cfc06455 100644 --- a/base/android/jni_array.cc +++ b/base/android/jni_array.cc @@ -8,7 +8,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/logging.h" +#include "base/check_op.h" namespace base { namespace android { diff --git a/base/android/jni_weak_ref.cc b/base/android/jni_weak_ref.cc index 88efa723e5fd61..84b69318a42c3b 100644 --- a/base/android/jni_weak_ref.cc +++ b/base/android/jni_weak_ref.cc @@ -7,7 +7,6 @@ #include #include "base/android/jni_android.h" -#include "base/logging.h" using base::android::AttachCurrentThread; diff --git a/base/android/library_loader/anchor_functions.cc b/base/android/library_loader/anchor_functions.cc index 01575b8559b488..3f87887eb2d41b 100644 --- a/base/android/library_loader/anchor_functions.cc +++ b/base/android/library_loader/anchor_functions.cc @@ -4,7 +4,6 @@ #include "base/android/library_loader/anchor_functions.h" -#include "base/logging.h" #include "build/build_config.h" #if BUILDFLAG(SUPPORTS_CODE_ORDERING) diff --git a/base/android/reached_addresses_bitset.cc b/base/android/reached_addresses_bitset.cc index 9be0b10eb4af35..e4fc1d1e28e5d1 100644 --- a/base/android/reached_addresses_bitset.cc +++ b/base/android/reached_addresses_bitset.cc @@ -6,7 +6,7 @@ #include "base/android/library_loader/anchor_functions.h" #include "base/android/library_loader/anchor_functions_buildflags.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/no_destructor.h" namespace base { diff --git a/base/android/scoped_java_ref.cc b/base/android/scoped_java_ref.cc index 7d31a75bc8f1fa..311ec5b967e3a2 100644 --- a/base/android/scoped_java_ref.cc +++ b/base/android/scoped_java_ref.cc @@ -5,7 +5,7 @@ #include "base/android/scoped_java_ref.h" #include "base/android/jni_android.h" -#include "base/logging.h" +#include "base/check_op.h" namespace base { namespace android { diff --git a/base/at_exit.cc b/base/at_exit.cc index eb7d26cdc7c137..698d9f319ad470 100644 --- a/base/at_exit.cc +++ b/base/at_exit.cc @@ -10,7 +10,8 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" namespace base { diff --git a/base/base64_encode_fuzzer.cc b/base/base64_encode_fuzzer.cc index 57086efb84309b..4e577104f43c4e 100644 --- a/base/base64_encode_fuzzer.cc +++ b/base/base64_encode_fuzzer.cc @@ -5,7 +5,7 @@ #include #include "base/base64.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/strings/string_piece.h" // Encode some random data, and then decode it. diff --git a/base/base_paths_android.cc b/base/base_paths_android.cc index 078f565a5cadf3..e82af0e65a4860 100644 --- a/base/base_paths_android.cc +++ b/base/base_paths_android.cc @@ -13,7 +13,7 @@ #include "base/base_paths.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/process/process_metrics.h" namespace base { diff --git a/base/build_time.cc b/base/build_time.cc index c7462b15fb174b..447e445327de69 100644 --- a/base/build_time.cc +++ b/base/build_time.cc @@ -7,7 +7,7 @@ // Imports the generated build date, i.e. BUILD_DATE. #include "base/generated_build_date.h" -#include "base/logging.h" +#include "base/check.h" #include "base/time/time.h" namespace base { diff --git a/base/callback_internal.cc b/base/callback_internal.cc index 6a185d90929543..0dd5d6c3630709 100644 --- a/base/callback_internal.cc +++ b/base/callback_internal.cc @@ -4,7 +4,8 @@ #include "base/callback_internal.h" -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" namespace base { namespace internal { diff --git a/base/callback_unittest.cc b/base/callback_unittest.cc index eab895da318157..d02defc6ba6951 100644 --- a/base/callback_unittest.cc +++ b/base/callback_unittest.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/callback_internal.h" -#include "base/logging.h" #include "base/memory/ref_counted.h" +#include "base/notreached.h" #include "base/test/test_timeouts.h" #include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/check_example.cc b/base/check_example.cc index 7b9d8e6a80e149..1f905a4baff3bf 100644 --- a/base/check_example.cc +++ b/base/check_example.cc @@ -5,8 +5,10 @@ // This file is meant for analyzing the code generated by the CHECK // macros in a small executable file that's easy to disassemble. +#include + +#include "base/check_op.h" #include "base/compiler_specific.h" -#include "base/logging.h" // An official build shouldn't generate code to print out messages for // the CHECK* macros, nor should it have the strings in the diff --git a/base/containers/intrusive_heap.cc b/base/containers/intrusive_heap.cc index e9c948a53cdc0a..758ae0fe67474e 100644 --- a/base/containers/intrusive_heap.cc +++ b/base/containers/intrusive_heap.cc @@ -4,7 +4,7 @@ #include "base/containers/intrusive_heap.h" -#include "base/logging.h" +#include "base/check.h" #include "base/memory/ptr_util.h" namespace base { diff --git a/base/containers/intrusive_heap_unittest.cc b/base/containers/intrusive_heap_unittest.cc index 55f0d3b98603c2..85b98ab78fc878 100644 --- a/base/containers/intrusive_heap_unittest.cc +++ b/base/containers/intrusive_heap_unittest.cc @@ -4,8 +4,9 @@ #include "base/containers/intrusive_heap.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/memory/ptr_util.h" +#include "base/notreached.h" #include "base/rand_util.h" #include "base/stl_util.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/base/debug/activity_analyzer.cc b/base/debug/activity_analyzer.cc index ea754e452aa847..143174a5678b62 100644 --- a/base/debug/activity_analyzer.cc +++ b/base/debug/activity_analyzer.cc @@ -7,10 +7,10 @@ #include #include +#include "base/check_op.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/memory_mapped_file.h" -#include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" diff --git a/base/debug/asan_invalid_access.cc b/base/debug/asan_invalid_access.cc index f464bf6654f425..4f3427c1632cfd 100644 --- a/base/debug/asan_invalid_access.cc +++ b/base/debug/asan_invalid_access.cc @@ -8,8 +8,8 @@ #include +#include "base/check.h" #include "base/debug/alias.h" -#include "base/logging.h" #include "build/build_config.h" #if defined(OS_WIN) diff --git a/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc index 1731e7c39330b1..de383b80821438 100644 --- a/base/debug/debugger_posix.cc +++ b/base/debug/debugger_posix.cc @@ -17,8 +17,9 @@ #include #include +#include "base/check_op.h" #include "base/clang_profiling_buildflags.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/threading/platform_thread.h" diff --git a/base/debug/dump_without_crashing.cc b/base/debug/dump_without_crashing.cc index 1ab8c9cc4133ec..3e2fa17ca68549 100644 --- a/base/debug/dump_without_crashing.cc +++ b/base/debug/dump_without_crashing.cc @@ -4,7 +4,7 @@ #include "base/debug/dump_without_crashing.h" -#include "base/logging.h" +#include "base/check.h" namespace { diff --git a/base/debug/invalid_access_win.cc b/base/debug/invalid_access_win.cc index 993044e22ac929..48af993acdc91b 100644 --- a/base/debug/invalid_access_win.cc +++ b/base/debug/invalid_access_win.cc @@ -7,7 +7,7 @@ #include #include -#include "base/logging.h" +#include "base/check.h" #include "base/win/windows_version.h" namespace base { diff --git a/base/debug/stack_trace.cc b/base/debug/stack_trace.cc index d8ca822d9663c7..e437c9b00ffb10 100644 --- a/base/debug/stack_trace.cc +++ b/base/debug/stack_trace.cc @@ -9,7 +9,7 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/stl_util.h" #if BUILDFLAG(CAN_UNWIND_WITH_FRAME_POINTERS) diff --git a/base/deferred_sequenced_task_runner.cc b/base/deferred_sequenced_task_runner.cc index 18e81ff19e62f2..0495b12a353ef7 100644 --- a/base/deferred_sequenced_task_runner.cc +++ b/base/deferred_sequenced_task_runner.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/logging.h" +#include "base/check.h" namespace base { diff --git a/base/file_version_info_win.cc b/base/file_version_info_win.cc index 00a53e7645767c..242cb01d7c6195 100644 --- a/base/file_version_info_win.cc +++ b/base/file_version_info_win.cc @@ -9,8 +9,8 @@ #include +#include "base/check.h" #include "base/files/file_path.h" -#include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/stl_util.h" #include "base/strings/string_util.h" diff --git a/base/files/dir_reader_posix_unittest.cc b/base/files/dir_reader_posix_unittest.cc index 1954cb2f08f3bc..72d61529d6f1ea 100644 --- a/base/files/dir_reader_posix_unittest.cc +++ b/base/files/dir_reader_posix_unittest.cc @@ -11,8 +11,8 @@ #include #include +#include "base/check.h" #include "base/files/scoped_temp_dir.h" -#include "base/logging.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/files/file.cc b/base/files/file.cc index db582ba5cae9d1..22057eddefc3f9 100644 --- a/base/files/file.cc +++ b/base/files/file.cc @@ -6,10 +6,11 @@ #include +#include "base/check_op.h" #include "base/files/file_path.h" #include "base/files/file_tracing.h" -#include "base/logging.h" #include "base/metrics/histogram.h" +#include "base/notreached.h" #include "base/numerics/safe_conversions.h" #include "base/timer/elapsed_timer.h" #include "build/build_config.h" diff --git a/base/files/file_enumerator_win.cc b/base/files/file_enumerator_win.cc index a11e83bd719e7a..0185c9f3ac810c 100644 --- a/base/files/file_enumerator_win.cc +++ b/base/files/file_enumerator_win.cc @@ -7,7 +7,8 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" #include "base/strings/string_util.h" #include "base/threading/scoped_blocking_call.h" #include "base/win/shlwapi.h" diff --git a/base/files/file_path.cc b/base/files/file_path.cc index 65459e00457f92..f1a4b0a9bf695b 100644 --- a/base/files/file_path.cc +++ b/base/files/file_path.cc @@ -7,7 +7,7 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/macros.h" #include "base/pickle.h" #include "base/strings/strcat.h" diff --git a/base/files/file_path_watcher.cc b/base/files/file_path_watcher.cc index af403468585854..17527e25c5f53f 100644 --- a/base/files/file_path_watcher.cc +++ b/base/files/file_path_watcher.cc @@ -7,7 +7,7 @@ #include "base/files/file_path_watcher.h" -#include "base/logging.h" +#include "base/check.h" #include "build/build_config.h" namespace base { diff --git a/base/files/file_path_watcher_fsevents.cc b/base/files/file_path_watcher_fsevents.cc index 7ac9f751f7e359..5b7132e0a3320f 100644 --- a/base/files/file_path_watcher_fsevents.cc +++ b/base/files/file_path_watcher_fsevents.cc @@ -9,9 +9,9 @@ #include #include "base/bind.h" +#include "base/check.h" #include "base/files/file_util.h" #include "base/lazy_instance.h" -#include "base/logging.h" #include "base/mac/scoped_cftyperef.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" diff --git a/base/files/file_posix.cc b/base/files/file_posix.cc index b925602649d265..7780af7cd3092b 100644 --- a/base/files/file_posix.cc +++ b/base/files/file_posix.cc @@ -9,8 +9,9 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/metrics/histogram_functions.h" +#include "base/notreached.h" #include "base/posix/eintr_wrapper.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/scoped_blocking_call.h" diff --git a/base/files/file_util.cc b/base/files/file_util.cc index 0ae3784070c486..5ecb877db2139d 100644 --- a/base/files/file_util.cc +++ b/base/files/file_util.cc @@ -13,9 +13,9 @@ #include #include +#include "base/check_op.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" -#include "base/logging.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/base/files/file_win.cc b/base/files/file_win.cc index 86434ca3ed33b3..7a3f4cdefb05f0 100644 --- a/base/files/file_win.cc +++ b/base/files/file_win.cc @@ -7,8 +7,9 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/metrics/histogram_functions.h" +#include "base/notreached.h" #include "base/strings/string_util.h" #include "base/threading/scoped_blocking_call.h" diff --git a/base/files/important_file_writer_unittest.cc b/base/files/important_file_writer_unittest.cc index 1d6b6336f68909..9a74c0eb08568f 100644 --- a/base/files/important_file_writer_unittest.cc +++ b/base/files/important_file_writer_unittest.cc @@ -10,9 +10,9 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/location.h" -#include "base/logging.h" #include "base/macros.h" #include "base/memory/ptr_util.h" +#include "base/notreached.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/test/metrics/histogram_tester.h" diff --git a/base/files/scoped_file.cc b/base/files/scoped_file.cc index 1b9227d9779e9b..aa353f00474cc5 100644 --- a/base/files/scoped_file.cc +++ b/base/files/scoped_file.cc @@ -4,7 +4,7 @@ #include "base/files/scoped_file.h" -#include "base/logging.h" +#include "base/check.h" #include "build/build_config.h" #if defined(OS_POSIX) || defined(OS_FUCHSIA) diff --git a/base/fuchsia/default_context.cc b/base/fuchsia/default_context.cc index 654a9cb4720461..932415422f1f4c 100644 --- a/base/fuchsia/default_context.cc +++ b/base/fuchsia/default_context.cc @@ -7,7 +7,6 @@ #include #include "base/fuchsia/file_utils.h" -#include "base/logging.h" #include "base/no_destructor.h" namespace base { diff --git a/base/fuchsia/default_job.cc b/base/fuchsia/default_job.cc index b23d1d1f45751c..3112b65c326e01 100644 --- a/base/fuchsia/default_job.cc +++ b/base/fuchsia/default_job.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check_op.h" namespace base { diff --git a/base/fuchsia/intl_profile_watcher_unittest.cc b/base/fuchsia/intl_profile_watcher_unittest.cc index 23d854316029e2..110e5bfdd1ba2f 100644 --- a/base/fuchsia/intl_profile_watcher_unittest.cc +++ b/base/fuchsia/intl_profile_watcher_unittest.cc @@ -10,7 +10,7 @@ #include #include -#include "base/logging.h" +#include "base/check.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/bind_test_util.h" diff --git a/base/hash/hash.cc b/base/hash/hash.cc index a6348a553d06a0..d038c4735e1463 100644 --- a/base/hash/hash.cc +++ b/base/hash/hash.cc @@ -4,7 +4,8 @@ #include "base/hash/hash.h" -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" #include "base/rand_util.h" #include "base/third_party/cityhash/city.h" #include "build/build_config.h" diff --git a/base/i18n/break_iterator.cc b/base/i18n/break_iterator.cc index 27c132ca615895..e4765a0e5ad556 100644 --- a/base/i18n/break_iterator.cc +++ b/base/i18n/break_iterator.cc @@ -6,8 +6,9 @@ #include +#include "base/check.h" #include "base/lazy_instance.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/synchronization/lock.h" #include "third_party/icu/source/common/unicode/ubrk.h" #include "third_party/icu/source/common/unicode/uchar.h" diff --git a/base/i18n/char_iterator.cc b/base/i18n/char_iterator.cc index 7c298084663f8e..7b7318c07901be 100644 --- a/base/i18n/char_iterator.cc +++ b/base/i18n/char_iterator.cc @@ -4,7 +4,7 @@ #include "base/i18n/char_iterator.h" -#include "base/logging.h" +#include "base/check_op.h" #include "third_party/icu/source/common/unicode/utf16.h" #include "third_party/icu/source/common/unicode/utf8.h" diff --git a/base/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc index ded1015442c571..f7525adf8161b8 100644 --- a/base/i18n/file_util_icu.cc +++ b/base/i18n/file_util_icu.cc @@ -10,10 +10,10 @@ #include +#include "base/check.h" #include "base/files/file_path.h" #include "base/i18n/icu_string_conversions.h" #include "base/i18n/string_compare.h" -#include "base/logging.h" #include "base/macros.h" #include "base/memory/singleton.h" #include "base/strings/string_util.h" diff --git a/base/i18n/icu_string_conversions.cc b/base/i18n/icu_string_conversions.cc index 50321c25057904..08a020ff44f792 100644 --- a/base/i18n/icu_string_conversions.cc +++ b/base/i18n/icu_string_conversions.cc @@ -10,7 +10,8 @@ #include #include -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "third_party/icu/source/common/unicode/normalizer2.h" diff --git a/base/i18n/icu_string_conversions_unittest.cc b/base/i18n/icu_string_conversions_unittest.cc index 07a81727329c32..74b4f773c83f56 100644 --- a/base/i18n/icu_string_conversions_unittest.cc +++ b/base/i18n/icu_string_conversions_unittest.cc @@ -9,9 +9,9 @@ #include #include +#include "base/check_op.h" #include "base/format_macros.h" #include "base/i18n/icu_string_conversions.h" -#include "base/logging.h" #include "base/stl_util.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" diff --git a/base/i18n/number_formatting.cc b/base/i18n/number_formatting.cc index bb9c940c8f159d..31d5e14d379d85 100644 --- a/base/i18n/number_formatting.cc +++ b/base/i18n/number_formatting.cc @@ -8,11 +8,11 @@ #include +#include "base/check.h" #include "base/format_macros.h" #include "base/i18n/message_formatter.h" #include "base/i18n/unicodestring.h" #include "base/lazy_instance.h" -#include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" diff --git a/base/i18n/streaming_utf8_validator.cc b/base/i18n/streaming_utf8_validator.cc index 19c86a37a471e9..29c40ca6c9a7b5 100644 --- a/base/i18n/streaming_utf8_validator.cc +++ b/base/i18n/streaming_utf8_validator.cc @@ -8,8 +8,8 @@ #include "base/i18n/streaming_utf8_validator.h" +#include "base/check_op.h" #include "base/i18n/utf8_validator_tables.h" -#include "base/logging.h" namespace base { namespace { diff --git a/base/i18n/string_compare.cc b/base/i18n/string_compare.cc index 6cd59b98f49210..c0e83c6f7306f7 100644 --- a/base/i18n/string_compare.cc +++ b/base/i18n/string_compare.cc @@ -4,7 +4,7 @@ #include "base/i18n/string_compare.h" -#include "base/logging.h" +#include "base/check.h" #include "base/strings/utf_string_conversions.h" #include "third_party/icu/source/common/unicode/unistr.h" diff --git a/base/i18n/string_search.cc b/base/i18n/string_search.cc index 8088adf2ce5b8f..9f830d48924e73 100644 --- a/base/i18n/string_search.cc +++ b/base/i18n/string_search.cc @@ -5,7 +5,6 @@ #include #include "base/i18n/string_search.h" -#include "base/logging.h" #include "third_party/icu/source/i18n/unicode/usearch.h" diff --git a/base/json/json_file_value_serializer.cc b/base/json/json_file_value_serializer.cc index 6ec275cf5ca856..683259d718e3d2 100644 --- a/base/json/json_file_value_serializer.cc +++ b/base/json/json_file_value_serializer.cc @@ -4,9 +4,10 @@ #include "base/json/json_file_value_serializer.h" +#include "base/check.h" #include "base/files/file_util.h" #include "base/json/json_string_value_serializer.h" -#include "base/logging.h" +#include "base/notreached.h" #include "build/build_config.h" using base::FilePath; diff --git a/base/json/json_parser.cc b/base/json/json_parser.cc index 94a6741d6547ee..745a29083e078c 100644 --- a/base/json/json_parser.cc +++ b/base/json/json_parser.cc @@ -8,7 +8,7 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/macros.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h" diff --git a/base/json/json_reader.cc b/base/json/json_reader.cc index 8f13b094e65dff..53e3df9fdf3927 100644 --- a/base/json/json_reader.cc +++ b/base/json/json_reader.cc @@ -8,7 +8,7 @@ #include #include "base/json/json_parser.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/optional.h" namespace base { diff --git a/base/json/json_string_value_serializer.cc b/base/json/json_string_value_serializer.cc index f97909032c78f3..0ec48ca57fefef 100644 --- a/base/json/json_string_value_serializer.cc +++ b/base/json/json_string_value_serializer.cc @@ -6,7 +6,6 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" -#include "base/logging.h" using base::Value; diff --git a/base/memory/discardable_memory_allocator.cc b/base/memory/discardable_memory_allocator.cc index ac6a3ba48e2320..ecd0ed03b155a4 100644 --- a/base/memory/discardable_memory_allocator.cc +++ b/base/memory/discardable_memory_allocator.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check.h" #include "base/process/memory.h" namespace base { diff --git a/base/memory/memory_pressure_monitor.cc b/base/memory/memory_pressure_monitor.cc index bab52f375537fc..7624c4557db276 100644 --- a/base/memory/memory_pressure_monitor.cc +++ b/base/memory/memory_pressure_monitor.cc @@ -4,8 +4,9 @@ #include "base/memory/memory_pressure_monitor.h" -#include "base/logging.h" +#include "base/check.h" #include "base/metrics/histogram_macros.h" +#include "base/notreached.h" namespace base { namespace { diff --git a/base/memory/platform_shared_memory_region_unittest.cc b/base/memory/platform_shared_memory_region_unittest.cc index fbf5a216863773..10e8fe0db65ec7 100644 --- a/base/memory/platform_shared_memory_region_unittest.cc +++ b/base/memory/platform_shared_memory_region_unittest.cc @@ -4,7 +4,7 @@ #include "base/memory/platform_shared_memory_region.h" -#include "base/logging.h" +#include "base/check.h" #include "base/memory/shared_memory_mapping.h" #include "base/process/process_metrics.h" #include "base/system/sys_info.h" diff --git a/base/memory/ref_counted_memory.cc b/base/memory/ref_counted_memory.cc index fa140157f86944..76ce768b754a3f 100644 --- a/base/memory/ref_counted_memory.cc +++ b/base/memory/ref_counted_memory.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/memory/read_only_shared_memory_region.h" namespace base { diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc index 7e0b9c5520dbf4..d4b68bed9fb590 100644 --- a/base/message_loop/message_loop.cc +++ b/base/message_loop/message_loop.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/memory/ptr_util.h" #include "base/message_loop/message_pump_default.h" #include "base/message_loop/message_pump_for_io.h" diff --git a/base/message_loop/message_pump.cc b/base/message_loop/message_pump.cc index 9357b523b60527..81ba252ee3e9d7 100644 --- a/base/message_loop/message_pump.cc +++ b/base/message_loop/message_pump.cc @@ -4,10 +4,11 @@ #include "base/message_loop/message_pump.h" -#include "base/logging.h" +#include "base/check.h" #include "base/message_loop/message_pump_default.h" #include "base/message_loop/message_pump_for_io.h" #include "base/message_loop/message_pump_for_ui.h" +#include "base/notreached.h" #if defined(OS_MACOSX) #include "base/message_loop/message_pump_mac.h" diff --git a/base/message_loop/message_pump_android.cc b/base/message_loop/message_pump_android.cc index 9b5149182286ab..85a25deab2fd2c 100644 --- a/base/message_loop/message_pump_android.cc +++ b/base/message_loop/message_pump_android.cc @@ -17,8 +17,9 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" #include "base/callback_helpers.h" +#include "base/check_op.h" #include "base/lazy_instance.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/run_loop.h" #include "build/build_config.h" diff --git a/base/metrics/bucket_ranges.cc b/base/metrics/bucket_ranges.cc index a3473bbf7894ff..073f51707d1f49 100644 --- a/base/metrics/bucket_ranges.cc +++ b/base/metrics/bucket_ranges.cc @@ -6,7 +6,6 @@ #include -#include "base/logging.h" #include "base/metrics/crc32.h" namespace base { diff --git a/base/metrics/dummy_histogram.cc b/base/metrics/dummy_histogram.cc index 2707733b2d4469..f364ade4525f6e 100644 --- a/base/metrics/dummy_histogram.cc +++ b/base/metrics/dummy_histogram.cc @@ -6,9 +6,9 @@ #include -#include "base/logging.h" #include "base/metrics/histogram_samples.h" #include "base/metrics/metrics_hashes.h" +#include "base/notreached.h" namespace base { diff --git a/base/metrics/histogram_base.cc b/base/metrics/histogram_base.cc index 9904fd1adb4e23..8d55e92e1dde62 100644 --- a/base/metrics/histogram_base.cc +++ b/base/metrics/histogram_base.cc @@ -10,14 +10,15 @@ #include #include +#include "base/check_op.h" #include "base/json/json_string_value_serializer.h" -#include "base/logging.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_samples.h" #include "base/metrics/sparse_histogram.h" #include "base/metrics/statistics_recorder.h" #include "base/no_destructor.h" +#include "base/notreached.h" #include "base/numerics/safe_conversions.h" #include "base/pickle.h" #include "base/process/process_handle.h" diff --git a/base/metrics/metrics_hashes.cc b/base/metrics/metrics_hashes.cc index 9cd2d5a93e31cf..1f90b56a063097 100644 --- a/base/metrics/metrics_hashes.cc +++ b/base/metrics/metrics_hashes.cc @@ -6,8 +6,8 @@ #include +#include "base/check_op.h" #include "base/hash/md5.h" -#include "base/logging.h" #include "base/sys_byteorder.h" namespace base { diff --git a/base/metrics/persistent_histogram_allocator_unittest.cc b/base/metrics/persistent_histogram_allocator_unittest.cc index aee6ceb792f609..0776ad4dacc9d7 100644 --- a/base/metrics/persistent_histogram_allocator_unittest.cc +++ b/base/metrics/persistent_histogram_allocator_unittest.cc @@ -7,7 +7,6 @@ #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" -#include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/bucket_ranges.h" #include "base/metrics/histogram_macros.h" diff --git a/base/metrics/persistent_sample_map.cc b/base/metrics/persistent_sample_map.cc index ba73128b7d57c6..06ee80e8a818b8 100644 --- a/base/metrics/persistent_sample_map.cc +++ b/base/metrics/persistent_sample_map.cc @@ -4,9 +4,10 @@ #include "base/metrics/persistent_sample_map.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/persistent_histogram_allocator.h" +#include "base/notreached.h" #include "base/numerics/safe_conversions.h" #include "base/stl_util.h" diff --git a/base/metrics/sample_map.cc b/base/metrics/sample_map.cc index f9252386af8da9..ec7e6aa1235a74 100644 --- a/base/metrics/sample_map.cc +++ b/base/metrics/sample_map.cc @@ -4,7 +4,7 @@ #include "base/metrics/sample_map.h" -#include "base/logging.h" +#include "base/check.h" #include "base/numerics/safe_conversions.h" #include "base/stl_util.h" diff --git a/base/metrics/sample_vector.cc b/base/metrics/sample_vector.cc index cf8634e8367993..a465fbd6c91eeb 100644 --- a/base/metrics/sample_vector.cc +++ b/base/metrics/sample_vector.cc @@ -4,10 +4,11 @@ #include "base/metrics/sample_vector.h" +#include "base/check_op.h" #include "base/lazy_instance.h" -#include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/persistent_memory_allocator.h" +#include "base/notreached.h" #include "base/numerics/safe_conversions.h" #include "base/synchronization/lock.h" #include "base/threading/platform_thread.h" diff --git a/base/metrics/ukm_source_id.cc b/base/metrics/ukm_source_id.cc index ce8c886d068bcb..88bd08292fde92 100644 --- a/base/metrics/ukm_source_id.cc +++ b/base/metrics/ukm_source_id.cc @@ -5,7 +5,7 @@ #include "base/metrics/ukm_source_id.h" #include "base/atomic_sequence_num.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/rand_util.h" namespace base { diff --git a/base/native_library_fuchsia.cc b/base/native_library_fuchsia.cc index 898fb44484bcd6..d742defe33d86d 100644 --- a/base/native_library_fuchsia.cc +++ b/base/native_library_fuchsia.cc @@ -18,7 +18,7 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/fuchsia/fuchsia_logging.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/path_service.h" #include "base/posix/safe_strerror.h" #include "base/strings/stringprintf.h" diff --git a/base/no_destructor_unittest.cc b/base/no_destructor_unittest.cc index 49d314e5a0d293..63d5c13e4701db 100644 --- a/base/no_destructor_unittest.cc +++ b/base/no_destructor_unittest.cc @@ -10,7 +10,7 @@ #include "base/atomicops.h" #include "base/barrier_closure.h" #include "base/bind.h" -#include "base/logging.h" +#include "base/check.h" #include "base/system/sys_info.h" #include "base/threading/platform_thread.h" #include "base/threading/simple_thread.h" diff --git a/base/observer_list_perftest.cc b/base/observer_list_perftest.cc index 08f0af93d14c59..ae70a84e5c3288 100644 --- a/base/observer_list_perftest.cc +++ b/base/observer_list_perftest.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/observer_list.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" diff --git a/base/path_service.cc b/base/path_service.cc index cc29cab2f1ffb0..8b05f150b3604d 100644 --- a/base/path_service.cc +++ b/base/path_service.cc @@ -12,9 +12,9 @@ #include #endif +#include "base/check_op.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -#include "base/logging.h" #include "base/synchronization/lock.h" #include "build/build_config.h" diff --git a/base/power_monitor/power_monitor_device_source_stub.cc b/base/power_monitor/power_monitor_device_source_stub.cc index 74ed0144195508..29ad8d939b4d35 100644 --- a/base/power_monitor/power_monitor_device_source_stub.cc +++ b/base/power_monitor/power_monitor_device_source_stub.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/logging.h" +#include "base/notreached.h" #include "base/power_monitor/power_monitor_device_source.h" namespace base { diff --git a/base/process/process_handle.cc b/base/process/process_handle.cc index 57635fff993e59..7b130b40b14684 100644 --- a/base/process/process_handle.cc +++ b/base/process/process_handle.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check.h" #include "build/build_config.h" namespace base { diff --git a/base/process/process_iterator_fuchsia.cc b/base/process/process_iterator_fuchsia.cc index b9aa591513c048..9ea72d924f09cc 100644 --- a/base/process/process_iterator_fuchsia.cc +++ b/base/process/process_iterator_fuchsia.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/logging.h" +#include "base/notreached.h" #include "base/process/process_iterator.h" namespace base { diff --git a/base/process/process_linux.cc b/base/process/process_linux.cc index d97226ab0cfe03..b25df847833e6f 100644 --- a/base/process/process_linux.cc +++ b/base/process/process_linux.cc @@ -7,8 +7,9 @@ #include #include +#include "base/check.h" #include "base/files/file_util.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/posix/can_lower_nice_to.h" #include "base/process/internal_linux.h" #include "base/strings/string_number_conversions.h" diff --git a/base/process/process_metrics.cc b/base/process/process_metrics.cc index d53c08601c8d46..3a5aba3373e056 100644 --- a/base/process/process_metrics.cc +++ b/base/process/process_metrics.cc @@ -6,7 +6,8 @@ #include -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "base/values.h" #include "build/build_config.h" diff --git a/base/process/process_metrics_ios.cc b/base/process/process_metrics_ios.cc index 83fc3d69331b75..bc29a998cedbf0 100644 --- a/base/process/process_metrics_ios.cc +++ b/base/process/process_metrics_ios.cc @@ -8,9 +8,10 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/mac/scoped_mach_port.h" #include "base/memory/ptr_util.h" +#include "base/notreached.h" #include "base/numerics/safe_conversions.h" namespace base { diff --git a/base/profiler/native_unwinder_mac.cc b/base/profiler/native_unwinder_mac.cc index 5e4da9ddefc0d1..51717e1b5f2386 100644 --- a/base/profiler/native_unwinder_mac.cc +++ b/base/profiler/native_unwinder_mac.cc @@ -9,7 +9,8 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" #include "base/profiler/module_cache.h" #include "base/profiler/native_unwinder.h" #include "base/profiler/profile_builder.h" diff --git a/base/profiler/native_unwinder_win.cc b/base/profiler/native_unwinder_win.cc index b1e76e64842b2a..344b0901122c6e 100644 --- a/base/profiler/native_unwinder_win.cc +++ b/base/profiler/native_unwinder_win.cc @@ -6,7 +6,8 @@ #include -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" #include "base/profiler/native_unwinder.h" #include "base/profiler/win32_stack_frame_unwinder.h" diff --git a/base/profiler/stack_sampler_impl.cc b/base/profiler/stack_sampler_impl.cc index ba2b4c22f1f6dd..937092c5eedd33 100644 --- a/base/profiler/stack_sampler_impl.cc +++ b/base/profiler/stack_sampler_impl.cc @@ -6,8 +6,8 @@ #include +#include "base/check.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "base/profiler/metadata_recorder.h" #include "base/profiler/profile_builder.h" #include "base/profiler/sample_metadata.h" diff --git a/base/profiler/suspendable_thread_delegate_mac.cc b/base/profiler/suspendable_thread_delegate_mac.cc index 32fdd475cb2bb4..a31a0caf2b15cc 100644 --- a/base/profiler/suspendable_thread_delegate_mac.cc +++ b/base/profiler/suspendable_thread_delegate_mac.cc @@ -8,7 +8,7 @@ #include #include -#include "base/logging.h" +#include "base/check.h" #include "base/mac/mach_logging.h" #include "base/profiler/profile_builder.h" diff --git a/base/profiler/suspendable_thread_delegate_win.cc b/base/profiler/suspendable_thread_delegate_win.cc index e2a30cf34beee9..1fbc67eb3f2029 100644 --- a/base/profiler/suspendable_thread_delegate_win.cc +++ b/base/profiler/suspendable_thread_delegate_win.cc @@ -7,8 +7,8 @@ #include #include +#include "base/check.h" #include "base/debug/alias.h" -#include "base/logging.h" #include "base/profiler/native_unwinder_win.h" #include "build/build_config.h" diff --git a/base/rand_util.cc b/base/rand_util.cc index 5881ef25e39108..59f3253b409aee 100644 --- a/base/rand_util.cc +++ b/base/rand_util.cc @@ -11,7 +11,7 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/strings/string_util.h" namespace base { diff --git a/base/rand_util_nacl.cc b/base/rand_util_nacl.cc index b26b4086551ffb..85b92a42ef6b9c 100644 --- a/base/rand_util_nacl.cc +++ b/base/rand_util_nacl.cc @@ -8,7 +8,7 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" namespace base { diff --git a/base/rand_util_posix.cc b/base/rand_util_posix.cc index 767497ca7aa799..41ac6a0990e37c 100644 --- a/base/rand_util_posix.cc +++ b/base/rand_util_posix.cc @@ -10,8 +10,8 @@ #include #include +#include "base/check.h" #include "base/files/file_util.h" -#include "base/logging.h" #include "base/no_destructor.h" #include "base/posix/eintr_wrapper.h" diff --git a/base/rand_util_win.cc b/base/rand_util_win.cc index e85c216fc53369..c4c3810fe5b1b8 100644 --- a/base/rand_util_win.cc +++ b/base/rand_util_win.cc @@ -18,7 +18,7 @@ #include #include -#include "base/logging.h" +#include "base/check.h" namespace base { diff --git a/base/scoped_clear_last_error_unittest.cc b/base/scoped_clear_last_error_unittest.cc index c9e5978fbbaf62..e7bae2b60a0a1c 100644 --- a/base/scoped_clear_last_error_unittest.cc +++ b/base/scoped_clear_last_error_unittest.cc @@ -4,12 +4,12 @@ #include "base/scoped_clear_last_error.h" -#include "base/logging.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_WIN) #include +#include "base/logging.h" #endif // defined(OS_WIN) namespace base { diff --git a/base/security_unittest.cc b/base/security_unittest.cc index 5f90959bdd70d0..947a2a6592cc66 100644 --- a/base/security_unittest.cc +++ b/base/security_unittest.cc @@ -16,7 +16,6 @@ #include "base/allocator/buildflags.h" #include "base/files/file_util.h" -#include "base/logging.h" #include "base/memory/free_deleter.h" #include "base/sanitizer_buildflags.h" #include "build/build_config.h" diff --git a/base/sequence_checker_impl.cc b/base/sequence_checker_impl.cc index ea5d21bf0dfd88..fbf638c95f591f 100644 --- a/base/sequence_checker_impl.cc +++ b/base/sequence_checker_impl.cc @@ -4,7 +4,7 @@ #include "base/sequence_checker_impl.h" -#include "base/logging.h" +#include "base/check.h" #include "base/memory/ptr_util.h" #include "base/sequence_token.h" #include "base/threading/thread_checker_impl.h" diff --git a/base/sequence_token.cc b/base/sequence_token.cc index 3636c7f2ee7459..d80d77412783dc 100644 --- a/base/sequence_token.cc +++ b/base/sequence_token.cc @@ -5,7 +5,7 @@ #include "base/sequence_token.h" #include "base/atomic_sequence_num.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/no_destructor.h" #include "base/threading/thread_local.h" diff --git a/base/strings/safe_sprintf.cc b/base/strings/safe_sprintf.cc index 89049abd79b8da..3d351554ef00fb 100644 --- a/base/strings/safe_sprintf.cc +++ b/base/strings/safe_sprintf.cc @@ -35,7 +35,7 @@ // errno = 13 (Access denied) // In most of the anticipated use cases, that's probably the preferred // behavior. -#include "base/logging.h" +#include "base/check.h" #define DEBUG_CHECK RAW_CHECK #else #define DEBUG_CHECK(x) do { if (x) { } } while (0) diff --git a/base/strings/safe_sprintf_unittest.cc b/base/strings/safe_sprintf_unittest.cc index bb9908f9289b5f..2c2ec4b0cb9faa 100644 --- a/base/strings/safe_sprintf_unittest.cc +++ b/base/strings/safe_sprintf_unittest.cc @@ -12,7 +12,7 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/macros.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/strings/string_number_conversions.cc b/base/strings/string_number_conversions.cc index 8b71b0ae11363c..bd0a7e435f6db3 100644 --- a/base/strings/string_number_conversions.cc +++ b/base/strings/string_number_conversions.cc @@ -12,7 +12,7 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/no_destructor.h" #include "base/numerics/safe_math.h" #include "base/strings/string_util.h" diff --git a/base/strings/string_piece.cc b/base/strings/string_piece.cc index 2ecabeca2099b0..bd00baedee3fce 100644 --- a/base/strings/string_piece.cc +++ b/base/strings/string_piece.cc @@ -11,7 +11,6 @@ #include #include -#include "base/logging.h" #include "base/strings/utf_string_conversions.h" namespace base { diff --git a/base/strings/utf_offset_string_conversions.cc b/base/strings/utf_offset_string_conversions.cc index 356247e8011dd4..3e7c7daae61bd8 100644 --- a/base/strings/utf_offset_string_conversions.cc +++ b/base/strings/utf_offset_string_conversions.cc @@ -9,7 +9,7 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversion_utils.h" diff --git a/base/strings/utf_offset_string_conversions_unittest.cc b/base/strings/utf_offset_string_conversions_unittest.cc index 7753363110dda7..c1c761c03fbb0b 100644 --- a/base/strings/utf_offset_string_conversions_unittest.cc +++ b/base/strings/utf_offset_string_conversions_unittest.cc @@ -6,7 +6,6 @@ #include -#include "base/logging.h" #include "base/stl_util.h" #include "base/strings/string_piece.h" #include "base/strings/utf_offset_string_conversions.h" diff --git a/base/strings/utf_string_conversions_unittest.cc b/base/strings/utf_string_conversions_unittest.cc index cd799d288eef32..a79820fe05f197 100644 --- a/base/strings/utf_string_conversions_unittest.cc +++ b/base/strings/utf_string_conversions_unittest.cc @@ -4,7 +4,6 @@ #include -#include "base/logging.h" #include "base/stl_util.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" diff --git a/base/sync_socket_nacl.cc b/base/sync_socket_nacl.cc index 0be491744a6c26..c22d786960133a 100644 --- a/base/sync_socket_nacl.cc +++ b/base/sync_socket_nacl.cc @@ -10,7 +10,7 @@ #include #include -#include "base/logging.h" +#include "base/notreached.h" namespace base { diff --git a/base/sync_socket_posix.cc b/base/sync_socket_posix.cc index 321a541ba91b55..4f30690eeae3df 100644 --- a/base/sync_socket_posix.cc +++ b/base/sync_socket_posix.cc @@ -18,8 +18,8 @@ #include #endif +#include "base/check_op.h" #include "base/files/file_util.h" -#include "base/logging.h" #include "base/threading/scoped_blocking_call.h" #include "build/build_config.h" diff --git a/base/synchronization/atomic_flag.cc b/base/synchronization/atomic_flag.cc index 381dbc4f9b523f..e3c5f407e2645d 100644 --- a/base/synchronization/atomic_flag.cc +++ b/base/synchronization/atomic_flag.cc @@ -4,7 +4,7 @@ #include "base/synchronization/atomic_flag.h" -#include "base/logging.h" +#include "base/check_op.h" namespace base { diff --git a/base/synchronization/atomic_flag_unittest.cc b/base/synchronization/atomic_flag_unittest.cc index f7daafa502678c..b452b408d88b5b 100644 --- a/base/synchronization/atomic_flag_unittest.cc +++ b/base/synchronization/atomic_flag_unittest.cc @@ -5,7 +5,7 @@ #include "base/synchronization/atomic_flag.h" #include "base/bind.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/waitable_event.h" #include "base/test/gtest_util.h" diff --git a/base/synchronization/lock_impl_posix.cc b/base/synchronization/lock_impl_posix.cc index 7571f68a9a8480..bd709b42a9b913 100644 --- a/base/synchronization/lock_impl_posix.cc +++ b/base/synchronization/lock_impl_posix.cc @@ -6,8 +6,8 @@ #include +#include "base/check_op.h" #include "base/debug/activity_tracker.h" -#include "base/logging.h" #include "base/posix/safe_strerror.h" #include "base/strings/stringprintf.h" #include "base/synchronization/lock.h" diff --git a/base/synchronization/waitable_event_posix.cc b/base/synchronization/waitable_event_posix.cc index 1384e033ad310e..ab36f8dbef1a9f 100644 --- a/base/synchronization/waitable_event_posix.cc +++ b/base/synchronization/waitable_event_posix.cc @@ -8,8 +8,8 @@ #include #include +#include "base/check_op.h" #include "base/debug/activity_tracker.h" -#include "base/logging.h" #include "base/optional.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" diff --git a/base/synchronization/waitable_event_watcher_posix.cc b/base/synchronization/waitable_event_watcher_posix.cc index 2b296dafd75905..8e343fd3880dd2 100644 --- a/base/synchronization/waitable_event_watcher_posix.cc +++ b/base/synchronization/waitable_event_watcher_posix.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/logging.h" +#include "base/check.h" #include "base/synchronization/lock.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/base/system/sys_info.cc b/base/system/sys_info.cc index 6909668cc46b77..6096748c7ff116 100644 --- a/base/system/sys_info.cc +++ b/base/system/sys_info.cc @@ -11,8 +11,8 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/location.h" -#include "base/logging.h" #include "base/no_destructor.h" +#include "base/notreached.h" #include "base/system/sys_info_internal.h" #include "base/task/post_task.h" #include "base/task/task_traits.h" diff --git a/base/system/sys_info_chromeos.cc b/base/system/sys_info_chromeos.cc index e666b08a7a7d2e..1d688f13491c38 100644 --- a/base/system/sys_info_chromeos.cc +++ b/base/system/sys_info_chromeos.cc @@ -13,7 +13,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/lazy_instance.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" diff --git a/base/system/sys_info_freebsd.cc b/base/system/sys_info_freebsd.cc index 09ca9263125681..52d778a89d018c 100644 --- a/base/system/sys_info_freebsd.cc +++ b/base/system/sys_info_freebsd.cc @@ -8,7 +8,7 @@ #include #include -#include "base/logging.h" +#include "base/notreached.h" namespace base { diff --git a/base/system/sys_info_linux.cc b/base/system/sys_info_linux.cc index 27457b80131470..d9bfa496fdee91 100644 --- a/base/system/sys_info_linux.cc +++ b/base/system/sys_info_linux.cc @@ -9,9 +9,10 @@ #include +#include "base/check.h" #include "base/files/file_util.h" #include "base/lazy_instance.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/numerics/safe_conversions.h" #include "base/process/process_metrics.h" #include "base/strings/string_number_conversions.h" diff --git a/base/system/sys_info_openbsd.cc b/base/system/sys_info_openbsd.cc index c6bd917e4aae82..3dc98b048929ab 100644 --- a/base/system/sys_info_openbsd.cc +++ b/base/system/sys_info_openbsd.cc @@ -10,7 +10,7 @@ #include #include -#include "base/logging.h" +#include "base/notreached.h" #include "base/stl_util.h" namespace { diff --git a/base/system/sys_info_posix.cc b/base/system/sys_info_posix.cc index 58c0c4f63c37da..3368524026598d 100644 --- a/base/system/sys_info_posix.cc +++ b/base/system/sys_info_posix.cc @@ -15,7 +15,7 @@ #include "base/files/file_util.h" #include "base/lazy_instance.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info_internal.h" #include "base/threading/scoped_blocking_call.h" diff --git a/base/system/sys_info_win.cc b/base/system/sys_info_win.cc index 704abe4950e162..685e593faee23c 100644 --- a/base/system/sys_info_win.cc +++ b/base/system/sys_info_win.cc @@ -10,8 +10,9 @@ #include +#include "base/check.h" #include "base/files/file_path.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/process/process_metrics.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/base/task/cancelable_task_tracker_unittest.cc b/base/task/cancelable_task_tracker_unittest.cc index bf1a7bab274cdc..7bd0192d6ef8b5 100644 --- a/base/task/cancelable_task_tracker_unittest.cc +++ b/base/task/cancelable_task_tracker_unittest.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/check_op.h" #include "base/location.h" -#include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" diff --git a/base/task/common/checked_lock_impl.cc b/base/task/common/checked_lock_impl.cc index c801f057e2f22d..698886e16152ab 100644 --- a/base/task/common/checked_lock_impl.cc +++ b/base/task/common/checked_lock_impl.cc @@ -8,8 +8,8 @@ #include #include +#include "base/check_op.h" #include "base/lazy_instance.h" -#include "base/logging.h" #include "base/synchronization/condition_variable.h" #include "base/task/common/checked_lock.h" #include "base/threading/platform_thread.h" diff --git a/base/task/common/operations_controller.cc b/base/task/common/operations_controller.cc index 7787cdf2948944..14181ccf487622 100644 --- a/base/task/common/operations_controller.cc +++ b/base/task/common/operations_controller.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/task/common/operations_controller.h" -#include "base/logging.h" +#include "base/check_op.h" namespace base { namespace internal { diff --git a/base/task/lazy_thread_pool_task_runner.cc b/base/task/lazy_thread_pool_task_runner.cc index 47d52aee61591e..0b16f471cd54dd 100644 --- a/base/task/lazy_thread_pool_task_runner.cc +++ b/base/task/lazy_thread_pool_task_runner.cc @@ -6,8 +6,8 @@ #include +#include "base/check_op.h" #include "base/lazy_instance_helpers.h" -#include "base/logging.h" #include "base/task/thread_pool.h" namespace base { diff --git a/base/task/post_task.cc b/base/task/post_task.cc index c1d6d93c266cf9..12218599e4815f 100644 --- a/base/task/post_task.cc +++ b/base/task/post_task.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/task/scoped_set_task_priority_for_current_thread.h" #include "base/task/task_executor.h" #include "base/task/thread_pool/thread_pool_impl.h" diff --git a/base/task/scoped_set_task_priority_for_current_thread.cc b/base/task/scoped_set_task_priority_for_current_thread.cc index 38eb0e97d4ae4a..6020982bc6ca10 100644 --- a/base/task/scoped_set_task_priority_for_current_thread.cc +++ b/base/task/scoped_set_task_priority_for_current_thread.cc @@ -4,8 +4,8 @@ #include "base/task/scoped_set_task_priority_for_current_thread.h" +#include "base/check_op.h" #include "base/lazy_instance.h" -#include "base/logging.h" #include "base/threading/thread_local.h" namespace base { diff --git a/base/task/sequence_manager/atomic_flag_set.cc b/base/task/sequence_manager/atomic_flag_set.cc index 8ccc0276a59c4c..67a149f44593ba 100644 --- a/base/task/sequence_manager/atomic_flag_set.cc +++ b/base/task/sequence_manager/atomic_flag_set.cc @@ -8,7 +8,7 @@ #include "base/bits.h" #include "base/callback.h" -#include "base/logging.h" +#include "base/check_op.h" namespace base { namespace sequence_manager { diff --git a/base/task/sequence_manager/task_queue_selector.cc b/base/task/sequence_manager/task_queue_selector.cc index ad1a803db7f3ff..3b4f59d1efcb61 100644 --- a/base/task/sequence_manager/task_queue_selector.cc +++ b/base/task/sequence_manager/task_queue_selector.cc @@ -7,7 +7,7 @@ #include #include "base/bits.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/task/sequence_manager/associated_thread_id.h" #include "base/task/sequence_manager/task_queue_impl.h" #include "base/task/sequence_manager/work_queue.h" diff --git a/base/task/sequence_manager/test/mock_time_message_pump.cc b/base/task/sequence_manager/test/mock_time_message_pump.cc index 5912f29bf741d6..521f9c7338015a 100644 --- a/base/task/sequence_manager/test/mock_time_message_pump.cc +++ b/base/task/sequence_manager/test/mock_time_message_pump.cc @@ -7,7 +7,7 @@ #include #include "base/auto_reset.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/test/simple_test_tick_clock.h" namespace base { diff --git a/base/task/sequence_manager/work_deduplicator.cc b/base/task/sequence_manager/work_deduplicator.cc index fba71b506adbbe..f72eb7c7d88ae6 100644 --- a/base/task/sequence_manager/work_deduplicator.cc +++ b/base/task/sequence_manager/work_deduplicator.cc @@ -5,7 +5,7 @@ #include "base/task/sequence_manager/work_deduplicator.h" #include -#include "base/logging.h" +#include "base/check_op.h" namespace base { namespace sequence_manager { diff --git a/base/task/sequence_manager/work_queue_sets.cc b/base/task/sequence_manager/work_queue_sets.cc index 68ec961333867a..937b84b23d60ed 100644 --- a/base/task/sequence_manager/work_queue_sets.cc +++ b/base/task/sequence_manager/work_queue_sets.cc @@ -4,7 +4,7 @@ #include "base/task/sequence_manager/work_queue_sets.h" -#include "base/logging.h" +#include "base/check_op.h" namespace base { namespace sequence_manager { diff --git a/base/task/task_traits.cc b/base/task/task_traits.cc index 4ebb87a782c5a0..5f178bc2f1b978 100644 --- a/base/task/task_traits.cc +++ b/base/task/task_traits.cc @@ -8,7 +8,7 @@ #include -#include "base/logging.h" +#include "base/notreached.h" namespace base { diff --git a/base/task/thread_pool.cc b/base/task/thread_pool.cc index f5635d0ea656c7..24e2bba8a37746 100644 --- a/base/task/thread_pool.cc +++ b/base/task/thread_pool.cc @@ -4,7 +4,7 @@ #include "base/task/thread_pool.h" -#include "base/logging.h" +#include "base/check.h" #include "base/task/scoped_set_task_priority_for_current_thread.h" #include "base/task/task_traits.h" #include "base/task/thread_pool/thread_pool_impl.h" diff --git a/base/task/thread_pool/delayed_task_manager.cc b/base/task/thread_pool/delayed_task_manager.cc index 3b0d3d5f83135a..f5a01aed70f80e 100644 --- a/base/task/thread_pool/delayed_task_manager.cc +++ b/base/task/thread_pool/delayed_task_manager.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/logging.h" +#include "base/check.h" #include "base/sequenced_task_runner.h" #include "base/task/post_task.h" #include "base/task/thread_pool/task.h" diff --git a/base/task/thread_pool/job_task_source.cc b/base/task/thread_pool/job_task_source.cc index 8a1e7a1395fe4f..c86e3e0f1184a2 100644 --- a/base/task/thread_pool/job_task_source.cc +++ b/base/task/thread_pool/job_task_source.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/memory/ptr_util.h" #include "base/task/common/checked_lock.h" #include "base/task/task_features.h" diff --git a/base/task/thread_pool/priority_queue.cc b/base/task/thread_pool/priority_queue.cc index bbef766775a44e..e2798b7009a6a9 100644 --- a/base/task/thread_pool/priority_queue.cc +++ b/base/task/thread_pool/priority_queue.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/memory/ptr_util.h" #include "base/stl_util.h" diff --git a/base/task/thread_pool/sequence.cc b/base/task/thread_pool/sequence.cc index 0dd5780f8f791c..8ed7dd4881e213 100644 --- a/base/task/thread_pool/sequence.cc +++ b/base/task/thread_pool/sequence.cc @@ -7,9 +7,9 @@ #include #include "base/bind.h" +#include "base/check.h" #include "base/critical_closure.h" #include "base/feature_list.h" -#include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/task/task_features.h" #include "base/time/time.h" diff --git a/base/task/thread_pool/task_source.cc b/base/task/thread_pool/task_source.cc index 76454c3bd9d78c..82d7d595cbd232 100644 --- a/base/task/thread_pool/task_source.cc +++ b/base/task/thread_pool/task_source.cc @@ -6,8 +6,8 @@ #include +#include "base/check_op.h" #include "base/feature_list.h" -#include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/task/task_features.h" #include "base/task/thread_pool/task_tracker.h" diff --git a/base/task/thread_pool/task_tracker_unittest.cc b/base/task/thread_pool/task_tracker_unittest.cc index 8440af8d8e445e..e88fa46d274d39 100644 --- a/base/task/thread_pool/task_tracker_unittest.cc +++ b/base/task/thread_pool/task_tracker_unittest.cc @@ -13,7 +13,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/macros.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" diff --git a/base/task/thread_pool/test_task_factory.cc b/base/task/thread_pool/test_task_factory.cc index c1b84cc16e2df7..9d36b80ba600b1 100644 --- a/base/task/thread_pool/test_task_factory.cc +++ b/base/task/thread_pool/test_task_factory.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" +#include "base/check_op.h" #include "base/location.h" -#include "base/logging.h" #include "base/synchronization/waitable_event.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/base/task/thread_pool/thread_pool_instance.cc b/base/task/thread_pool/thread_pool_instance.cc index 4b70ee411eaace..ae3549b6a55d8d 100644 --- a/base/task/thread_pool/thread_pool_instance.cc +++ b/base/task/thread_pool/thread_pool_instance.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check.h" #include "base/memory/ptr_util.h" #include "base/system/sys_info.h" #include "base/task/thread_pool/thread_pool_impl.h" diff --git a/base/task/thread_pool/worker_thread.cc b/base/task/thread_pool/worker_thread.cc index 61b7358e127359..bfe31ef2ea9368 100644 --- a/base/task/thread_pool/worker_thread.cc +++ b/base/task/thread_pool/worker_thread.cc @@ -8,9 +8,9 @@ #include +#include "base/check_op.h" #include "base/compiler_specific.h" #include "base/debug/alias.h" -#include "base/logging.h" #include "base/task/thread_pool/environment_config.h" #include "base/task/thread_pool/task_tracker.h" #include "base/task/thread_pool/worker_thread_observer.h" diff --git a/base/task/thread_pool/worker_thread_stack.cc b/base/task/thread_pool/worker_thread_stack.cc index 40eadde9695f4a..75bc5c6f6fdc2e 100644 --- a/base/task/thread_pool/worker_thread_stack.cc +++ b/base/task/thread_pool/worker_thread_stack.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/stl_util.h" #include "base/task/thread_pool/worker_thread.h" diff --git a/base/task/thread_pool/worker_thread_stack_unittest.cc b/base/task/thread_pool/worker_thread_stack_unittest.cc index 1cc192568b9f1e..350f94ad17b8a1 100644 --- a/base/task/thread_pool/worker_thread_stack_unittest.cc +++ b/base/task/thread_pool/worker_thread_stack_unittest.cc @@ -4,7 +4,7 @@ #include "base/task/thread_pool/worker_thread_stack.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/memory/ref_counted.h" #include "base/task/thread_pool/task_source.h" #include "base/task/thread_pool/task_tracker.h" diff --git a/base/task_runner.cc b/base/task_runner.cc index 77726b9da4f050..348c79f35b2a42 100644 --- a/base/task_runner.cc +++ b/base/task_runner.cc @@ -7,8 +7,8 @@ #include #include "base/bind.h" +#include "base/check.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "base/threading/post_task_and_reply_impl.h" namespace base { diff --git a/base/test/fontconfig_util_linux.cc b/base/test/fontconfig_util_linux.cc index b7bf9e65f70a15..4f6c1c71349330 100644 --- a/base/test/fontconfig_util_linux.cc +++ b/base/test/fontconfig_util_linux.cc @@ -9,9 +9,9 @@ #include #include "base/base_paths.h" +#include "base/check.h" #include "base/environment.h" #include "base/files/file_path.h" -#include "base/logging.h" #include "base/path_service.h" namespace base { diff --git a/base/test/gtest_xml_unittest_result_printer.cc b/base/test/gtest_xml_unittest_result_printer.cc index cdbf699efb3319..709450b5329750 100644 --- a/base/test/gtest_xml_unittest_result_printer.cc +++ b/base/test/gtest_xml_unittest_result_printer.cc @@ -5,9 +5,9 @@ #include "base/test/gtest_xml_unittest_result_printer.h" #include "base/base64.h" +#include "base/check.h" #include "base/command_line.h" #include "base/files/file_util.h" -#include "base/logging.h" #include "base/test/test_switches.h" #include "base/time/time.h" diff --git a/base/test/gtest_xml_util.cc b/base/test/gtest_xml_util.cc index 79eceb623ceb30..1bac5a6b1d2b91 100644 --- a/base/test/gtest_xml_util.cc +++ b/base/test/gtest_xml_util.cc @@ -7,8 +7,8 @@ #include #include "base/base64.h" +#include "base/check.h" #include "base/files/file_util.h" -#include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/test/gtest_util.h" diff --git a/base/test/launcher/test_result.cc b/base/test/launcher/test_result.cc index 3c7c9d1ed1fa7c..6770a8ecc851b6 100644 --- a/base/test/launcher/test_result.cc +++ b/base/test/launcher/test_result.cc @@ -6,7 +6,8 @@ #include -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" namespace base { diff --git a/base/test/multiprocess_test_android.cc b/base/test/multiprocess_test_android.cc index 7fe64d820cb2e7..f3e3ea34bcad30 100644 --- a/base/test/multiprocess_test_android.cc +++ b/base/test/multiprocess_test_android.cc @@ -11,8 +11,8 @@ #include "base/android/jni_array.h" #include "base/android/scoped_java_ref.h" #include "base/base_switches.h" +#include "base/check.h" #include "base/command_line.h" -#include "base/logging.h" #include "base/test/test_support_jni_headers/MainReturnCodeResult_jni.h" #include "base/test/test_support_jni_headers/MultiprocessTestClientLauncher_jni.h" diff --git a/base/test/perf_log.cc b/base/test/perf_log.cc index 9212f4b3552f21..e275ac0922ff6e 100644 --- a/base/test/perf_log.cc +++ b/base/test/perf_log.cc @@ -5,7 +5,7 @@ #include "base/test/perf_log.h" #include "base/files/file_util.h" -#include "base/logging.h" +#include "base/notreached.h" namespace base { diff --git a/base/test/scoped_mock_time_message_loop_task_runner.cc b/base/test/scoped_mock_time_message_loop_task_runner.cc index 8e855e58faceee..0ace2923566e74 100644 --- a/base/test/scoped_mock_time_message_loop_task_runner.cc +++ b/base/test/scoped_mock_time_message_loop_task_runner.cc @@ -5,7 +5,7 @@ #include "base/test/scoped_mock_time_message_loop_task_runner.h" #include "base/bind.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/message_loop/message_loop_current.h" #include "base/run_loop.h" #include "base/test/test_pending_task.h" diff --git a/base/test/scoped_path_override.cc b/base/test/scoped_path_override.cc index b8cfd4a22a1454..dc4a34089ceccf 100644 --- a/base/test/scoped_path_override.cc +++ b/base/test/scoped_path_override.cc @@ -4,7 +4,7 @@ #include "base/test/scoped_path_override.h" -#include "base/logging.h" +#include "base/check.h" #include "base/path_service.h" namespace base { diff --git a/base/test/simple_test_tick_clock.cc b/base/test/simple_test_tick_clock.cc index 7ee3401ddb521b..3efeaceeef5d7c 100644 --- a/base/test/simple_test_tick_clock.cc +++ b/base/test/simple_test_tick_clock.cc @@ -4,7 +4,7 @@ #include "base/test/simple_test_tick_clock.h" -#include "base/logging.h" +#include "base/check.h" namespace base { diff --git a/base/test/test_discardable_memory_allocator.cc b/base/test/test_discardable_memory_allocator.cc index 2151f60850b7c7..26bc5b036a8ec7 100644 --- a/base/test/test_discardable_memory_allocator.cc +++ b/base/test/test_discardable_memory_allocator.cc @@ -7,7 +7,7 @@ #include #include -#include "base/logging.h" +#include "base/check.h" #include "base/memory/discardable_memory.h" #include "base/memory/ptr_util.h" diff --git a/base/test/test_file_util_linux.cc b/base/test/test_file_util_linux.cc index 253994be389728..85fb69fdfbec9d 100644 --- a/base/test/test_file_util_linux.cc +++ b/base/test/test_file_util_linux.cc @@ -18,7 +18,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_file.h" -#include "base/logging.h" +#include "base/notreached.h" namespace base { diff --git a/base/test/test_file_util_posix.cc b/base/test/test_file_util_posix.cc index 45aeb5b295ae77..02c214a42140ef 100644 --- a/base/test/test_file_util_posix.cc +++ b/base/test/test_file_util_posix.cc @@ -12,9 +12,10 @@ #include +#include "base/check_op.h" #include "base/files/file.h" #include "base/files/file_util.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" diff --git a/base/test/test_file_util_win.cc b/base/test/test_file_util_win.cc index 75a8fda133881a..d2a861b23aa72e 100644 --- a/base/test/test_file_util_win.cc +++ b/base/test/test_file_util_win.cc @@ -12,10 +12,11 @@ #include #include +#include "base/check_op.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -#include "base/logging.h" #include "base/memory/ptr_util.h" +#include "base/notreached.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/threading/platform_thread.h" diff --git a/base/test/test_io_thread.cc b/base/test/test_io_thread.cc index 5fb73e19394e74..15e4fe015c6b9f 100644 --- a/base/test/test_io_thread.cc +++ b/base/test/test_io_thread.cc @@ -4,7 +4,7 @@ #include "base/test/test_io_thread.h" -#include "base/logging.h" +#include "base/check.h" #include "base/message_loop/message_pump_type.h" namespace base { diff --git a/base/test/test_message_loop.cc b/base/test/test_message_loop.cc index fdf472aefc3ed7..14f60b0ca026e5 100644 --- a/base/test/test_message_loop.cc +++ b/base/test/test_message_loop.cc @@ -5,8 +5,8 @@ #include "base/test/test_message_loop.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "base/message_loop/message_pump_type.h" +#include "base/notreached.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "build/build_config.h" diff --git a/base/test/test_mock_time_task_runner.cc b/base/test/test_mock_time_task_runner.cc index d22490b1f995af..63aacf948d51a3 100644 --- a/base/test/test_mock_time_task_runner.cc +++ b/base/test/test_mock_time_task_runner.cc @@ -6,8 +6,8 @@ #include +#include "base/check_op.h" #include "base/containers/circular_deque.h" -#include "base/logging.h" #include "base/macros.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" diff --git a/base/test/test_reg_util_win.cc b/base/test/test_reg_util_win.cc index 3635bc9bdbc988..6bcfe60bfebfdb 100644 --- a/base/test/test_reg_util_win.cc +++ b/base/test/test_reg_util_win.cc @@ -7,7 +7,6 @@ #include #include "base/guid.h" -#include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" diff --git a/base/test/test_simple_task_runner.cc b/base/test/test_simple_task_runner.cc index 91c68618df1ccd..3e5d70ee4cf76b 100644 --- a/base/test/test_simple_task_runner.cc +++ b/base/test/test_simple_task_runner.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check.h" #include "base/memory/ptr_util.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/base/threading/platform_thread_internal_posix.cc b/base/threading/platform_thread_internal_posix.cc index 378a24d0d1d8f9..459b2ccffc04d5 100644 --- a/base/threading/platform_thread_internal_posix.cc +++ b/base/threading/platform_thread_internal_posix.cc @@ -5,7 +5,7 @@ #include "base/threading/platform_thread_internal_posix.h" #include "base/containers/adapters.h" -#include "base/logging.h" +#include "base/notreached.h" namespace base { diff --git a/base/threading/post_task_and_reply_impl.cc b/base/threading/post_task_and_reply_impl.cc index cc802746ee41fa..7dba8374e56a75 100644 --- a/base/threading/post_task_and_reply_impl.cc +++ b/base/threading/post_task_and_reply_impl.cc @@ -7,8 +7,8 @@ #include #include "base/bind.h" +#include "base/check_op.h" #include "base/debug/leak_annotations.h" -#include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/base/threading/scoped_blocking_call_internal.cc b/base/threading/scoped_blocking_call_internal.cc index d2c7d66438e3bd..7ee3d709c3d5d0 100644 --- a/base/threading/scoped_blocking_call_internal.cc +++ b/base/threading/scoped_blocking_call_internal.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/check_op.h" #include "base/lazy_instance.h" -#include "base/logging.h" #include "base/no_destructor.h" #include "base/scoped_clear_last_error.h" #include "base/task/scoped_set_task_priority_for_current_thread.h" diff --git a/base/threading/sequence_local_storage_map.cc b/base/threading/sequence_local_storage_map.cc index 2837aa034091e4..fbd863aadb6946 100644 --- a/base/threading/sequence_local_storage_map.cc +++ b/base/threading/sequence_local_storage_map.cc @@ -6,8 +6,8 @@ #include +#include "base/check_op.h" #include "base/lazy_instance.h" -#include "base/logging.h" #include "base/threading/thread_local.h" namespace base { diff --git a/base/threading/sequence_local_storage_slot.cc b/base/threading/sequence_local_storage_slot.cc index 5ae1d9f47aeff5..aca57ee7926dbf 100644 --- a/base/threading/sequence_local_storage_slot.cc +++ b/base/threading/sequence_local_storage_slot.cc @@ -7,7 +7,7 @@ #include #include "base/atomic_sequence_num.h" -#include "base/logging.h" +#include "base/check_op.h" namespace base { namespace internal { diff --git a/base/threading/sequenced_task_runner_handle.cc b/base/threading/sequenced_task_runner_handle.cc index 2bfc0cf42eec9d..4f329a0acb5ef7 100644 --- a/base/threading/sequenced_task_runner_handle.cc +++ b/base/threading/sequenced_task_runner_handle.cc @@ -6,8 +6,8 @@ #include +#include "base/check_op.h" #include "base/lazy_instance.h" -#include "base/logging.h" #include "base/threading/thread_local.h" namespace base { diff --git a/base/threading/simple_thread.cc b/base/threading/simple_thread.cc index 2477bc768654ab..b76f8a016b704b 100644 --- a/base/threading/simple_thread.cc +++ b/base/threading/simple_thread.cc @@ -4,7 +4,7 @@ #include "base/threading/simple_thread.h" -#include "base/logging.h" +#include "base/check.h" #include "base/strings/string_number_conversions.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_restrictions.h" diff --git a/base/threading/thread_checker_impl.cc b/base/threading/thread_checker_impl.cc index 18d5ea32de41fe..f282acfec81b15 100644 --- a/base/threading/thread_checker_impl.cc +++ b/base/threading/thread_checker_impl.cc @@ -4,7 +4,7 @@ #include "base/threading/thread_checker_impl.h" -#include "base/logging.h" +#include "base/check.h" #include "base/threading/thread_local.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/base/threading/thread_collision_warner.cc b/base/threading/thread_collision_warner.cc index 547e11ca66f971..d6d870948187d1 100644 --- a/base/threading/thread_collision_warner.cc +++ b/base/threading/thread_collision_warner.cc @@ -4,7 +4,7 @@ #include "base/threading/thread_collision_warner.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/threading/platform_thread.h" namespace base { diff --git a/base/threading/thread_id_name_manager.cc b/base/threading/thread_id_name_manager.cc index ba2f9b41cb183c..8abaa40722c600 100644 --- a/base/threading/thread_id_name_manager.cc +++ b/base/threading/thread_id_name_manager.cc @@ -7,7 +7,7 @@ #include #include -#include "base/logging.h" +#include "base/check.h" #include "base/memory/singleton.h" #include "base/no_destructor.h" #include "base/stl_util.h" diff --git a/base/threading/thread_local_storage.cc b/base/threading/thread_local_storage.cc index 204f34c272137d..efbd1b29a55a37 100644 --- a/base/threading/thread_local_storage.cc +++ b/base/threading/thread_local_storage.cc @@ -5,9 +5,10 @@ #include "base/threading/thread_local_storage.h" #include "base/atomicops.h" +#include "base/check_op.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "base/no_destructor.h" +#include "base/notreached.h" #include "base/synchronization/lock.h" #include "build/build_config.h" diff --git a/base/threading/thread_local_storage_posix.cc b/base/threading/thread_local_storage_posix.cc index 89edeee1d2a444..1a7d07641b85ac 100644 --- a/base/threading/thread_local_storage_posix.cc +++ b/base/threading/thread_local_storage_posix.cc @@ -4,7 +4,7 @@ #include "base/threading/thread_local_storage.h" -#include "base/logging.h" +#include "base/check_op.h" namespace base { diff --git a/base/threading/thread_local_storage_win.cc b/base/threading/thread_local_storage_win.cc index a9aec31da5305f..106214d3e4b8ac 100644 --- a/base/threading/thread_local_storage_win.cc +++ b/base/threading/thread_local_storage_win.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check.h" namespace base { diff --git a/base/threading/thread_local_unittest.cc b/base/threading/thread_local_unittest.cc index 47f4b54ccc62ee..ac0c74109438e2 100644 --- a/base/threading/thread_local_unittest.cc +++ b/base/threading/thread_local_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/threading/thread_local.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/macros.h" #include "base/optional.h" #include "base/synchronization/waitable_event.h" diff --git a/base/threading/thread_restrictions.cc b/base/threading/thread_restrictions.cc index 7a94f7ccc5e8d4..c7f07d2664674d 100644 --- a/base/threading/thread_restrictions.cc +++ b/base/threading/thread_restrictions.cc @@ -8,9 +8,9 @@ #if DCHECK_IS_ON() +#include "base/check_op.h" #include "base/debug/stack_trace.h" #include "base/lazy_instance.h" -#include "base/logging.h" #include "base/threading/thread_local.h" #include "build/build_config.h" diff --git a/base/threading/thread_task_runner_handle.cc b/base/threading/thread_task_runner_handle.cc index 4a9ac88f61c18f..ca57b36de2caef 100644 --- a/base/threading/thread_task_runner_handle.cc +++ b/base/threading/thread_task_runner_handle.cc @@ -8,8 +8,8 @@ #include #include "base/bind.h" +#include "base/check_op.h" #include "base/lazy_instance.h" -#include "base/logging.h" #include "base/run_loop.h" #include "base/threading/thread_local.h" diff --git a/base/time/time_conversion_posix.cc b/base/time/time_conversion_posix.cc index ba0a2b29664df0..7d6c0a90144089 100644 --- a/base/time/time_conversion_posix.cc +++ b/base/time/time_conversion_posix.cc @@ -10,7 +10,7 @@ #include -#include "base/logging.h" +#include "base/check_op.h" namespace base { diff --git a/base/time/time_exploded_icu.cc b/base/time/time_exploded_icu.cc index 620369b877fb97..41832e53912614 100644 --- a/base/time/time_exploded_icu.cc +++ b/base/time/time_exploded_icu.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check.h" #include "base/memory/ptr_util.h" #include "third_party/icu/source/i18n/unicode/calendar.h" #include "third_party/icu/source/i18n/unicode/timezone.h" diff --git a/base/time/time_now_posix.cc b/base/time/time_now_posix.cc index 4ce93c08119c76..a7fdb62747f08c 100644 --- a/base/time/time_now_posix.cc +++ b/base/time/time_now_posix.cc @@ -12,7 +12,8 @@ #endif #include -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "base/numerics/safe_math.h" #include "base/time/time_override.h" #include "build/build_config.h" diff --git a/base/time/time_unittest.cc b/base/time/time_unittest.cc index 27a8ae19b51c26..dd9462cf08ad36 100644 --- a/base/time/time_unittest.cc +++ b/base/time/time_unittest.cc @@ -10,8 +10,8 @@ #include #include "base/build_time.h" +#include "base/check_op.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/test/gtest_util.h" diff --git a/base/time/time_win.cc b/base/time/time_win.cc index c1976e64a6d849..7c13f8783b2d21 100644 --- a/base/time/time_win.cc +++ b/base/time/time_win.cc @@ -40,9 +40,10 @@ #include "base/atomicops.h" #include "base/bit_cast.h" +#include "base/check_op.h" #include "base/cpu.h" #include "base/feature_list.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/synchronization/lock.h" #include "base/threading/platform_thread.h" #include "base/time/time_override.h" diff --git a/base/timer/lap_timer.cc b/base/timer/lap_timer.cc index 3ff2465496f697..c569ee848ac40a 100644 --- a/base/timer/lap_timer.cc +++ b/base/timer/lap_timer.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/timer/lap_timer.h" -#include "base/logging.h" +#include "base/check_op.h" namespace base { diff --git a/base/timer/timer.cc b/base/timer/timer.cc index 815bc1195734bc..d00ea97049ba13 100644 --- a/base/timer/timer.cc +++ b/base/timer/timer.cc @@ -8,7 +8,7 @@ #include -#include "base/logging.h" +#include "base/check.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/threading/platform_thread.h" diff --git a/base/trace_event/category_registry.cc b/base/trace_event/category_registry.cc index 3002f49f51bc96..691336f8707522 100644 --- a/base/trace_event/category_registry.cc +++ b/base/trace_event/category_registry.cc @@ -8,8 +8,9 @@ #include +#include "base/check.h" #include "base/debug/leak_annotations.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" namespace base { diff --git a/base/trace_event/heap_profiler_allocation_context_tracker.cc b/base/trace_event/heap_profiler_allocation_context_tracker.cc index c0c382b32a963f..8e8bec8abb4970 100644 --- a/base/trace_event/heap_profiler_allocation_context_tracker.cc +++ b/base/trace_event/heap_profiler_allocation_context_tracker.cc @@ -10,11 +10,12 @@ #include #include "base/atomicops.h" +#include "base/check_op.h" #include "base/debug/debugging_buildflags.h" #include "base/debug/leak_annotations.h" #include "base/debug/stack_trace.h" -#include "base/logging.h" #include "base/no_destructor.h" +#include "base/notreached.h" #include "base/stl_util.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_local_storage.h" diff --git a/base/trace_event/memory_dump_request_args.cc b/base/trace_event/memory_dump_request_args.cc index 8be3c324047179..1af450d8a47bfe 100644 --- a/base/trace_event/memory_dump_request_args.cc +++ b/base/trace_event/memory_dump_request_args.cc @@ -4,7 +4,7 @@ #include "base/trace_event/memory_dump_request_args.h" -#include "base/logging.h" +#include "base/notreached.h" namespace base { namespace trace_event { diff --git a/base/trace_event/memory_dump_scheduler.cc b/base/trace_event/memory_dump_scheduler.cc index 8b03f5c90ba69e..ac9b12bae6aa11 100644 --- a/base/trace_event/memory_dump_scheduler.cc +++ b/base/trace_event/memory_dump_scheduler.cc @@ -8,7 +8,7 @@ #include #include "base/bind.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/threading/sequenced_task_runner_handle.h" namespace base { diff --git a/base/trace_event/trace_arguments.cc b/base/trace_event/trace_arguments.cc index d3f71247934960..0f283e00527d81 100644 --- a/base/trace_event/trace_arguments.cc +++ b/base/trace_event/trace_arguments.cc @@ -11,8 +11,9 @@ #include +#include "base/check_op.h" #include "base/json/string_escape.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/base/trace_event/trace_event_etw_export_win.cc b/base/trace_event/trace_event_etw_export_win.cc index bf7d6f1018be96..680cdbdc027362 100644 --- a/base/trace_event/trace_event_etw_export_win.cc +++ b/base/trace_event/trace_event_etw_export_win.cc @@ -7,8 +7,8 @@ #include #include "base/at_exit.h" +#include "base/check_op.h" #include "base/command_line.h" -#include "base/logging.h" #include "base/memory/singleton.h" #include "base/strings/string_tokenizer.h" #include "base/strings/utf_string_conversions.h" diff --git a/base/trace_event/trace_event_filter_test_utils.cc b/base/trace_event/trace_event_filter_test_utils.cc index 85b4cfa2768355..79663072eb17ee 100644 --- a/base/trace_event/trace_event_filter_test_utils.cc +++ b/base/trace_event/trace_event_filter_test_utils.cc @@ -4,7 +4,7 @@ #include "base/trace_event/trace_event_filter_test_utils.h" -#include "base/logging.h" +#include "base/check.h" namespace base { namespace trace_event { diff --git a/base/util/memory_pressure/multi_source_memory_pressure_monitor.cc b/base/util/memory_pressure/multi_source_memory_pressure_monitor.cc index eef7f7292ce86f..74f966381a4027 100644 --- a/base/util/memory_pressure/multi_source_memory_pressure_monitor.cc +++ b/base/util/memory_pressure/multi_source_memory_pressure_monitor.cc @@ -5,7 +5,7 @@ #include "base/util/memory_pressure/multi_source_memory_pressure_monitor.h" #include "base/bind.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/time/time.h" diff --git a/base/util/memory_pressure/system_memory_pressure_evaluator_mac.cc b/base/util/memory_pressure/system_memory_pressure_evaluator_mac.cc index 3b7ab5eb3d37bd..91dc9486f1f236 100644 --- a/base/util/memory_pressure/system_memory_pressure_evaluator_mac.cc +++ b/base/util/memory_pressure/system_memory_pressure_evaluator_mac.cc @@ -13,7 +13,7 @@ #include #include "base/bind.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/mac/mac_util.h" #include "base/memory/memory_pressure_monitor.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/base/values.cc b/base/values.cc index ecca445840a866..af4085323feac4 100644 --- a/base/values.cc +++ b/base/values.cc @@ -13,10 +13,11 @@ #include #include "base/bit_cast.h" +#include "base/check_op.h" #include "base/containers/checked_iterators.h" #include "base/json/json_writer.h" -#include "base/logging.h" #include "base/memory/ptr_util.h" +#include "base/notreached.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/base/version.cc b/base/version.cc index 2ee8793c03a55f..d084912ec8d996 100644 --- a/base/version.cc +++ b/base/version.cc @@ -8,7 +8,7 @@ #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" diff --git a/base/vlog_unittest.cc b/base/vlog_unittest.cc index 3c3f49cb13bc68..2fc683a440f50c 100644 --- a/base/vlog_unittest.cc +++ b/base/vlog_unittest.cc @@ -4,7 +4,6 @@ #include "base/vlog.h" -#include "base/logging.h" #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/win/embedded_i18n/language_selector.cc b/base/win/embedded_i18n/language_selector.cc index 762b3713e048e9..fde6a282b0f295 100644 --- a/base/win/embedded_i18n/language_selector.cc +++ b/base/win/embedded_i18n/language_selector.cc @@ -12,7 +12,7 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/base/win/enum_variant.cc b/base/win/enum_variant.cc index afff1d57432cd7..654cfc67c131f3 100644 --- a/base/win/enum_variant.cc +++ b/base/win/enum_variant.cc @@ -8,7 +8,7 @@ #include -#include "base/logging.h" +#include "base/check_op.h" namespace base { namespace win { diff --git a/base/win/event_trace_controller.cc b/base/win/event_trace_controller.cc index dfd9c7b74f89e3..770f742144f9d4 100644 --- a/base/win/event_trace_controller.cc +++ b/base/win/event_trace_controller.cc @@ -4,7 +4,7 @@ // // Implementation of a Windows event trace controller class. #include "base/win/event_trace_controller.h" -#include "base/logging.h" +#include "base/check.h" namespace base { namespace win { diff --git a/base/win/hstring_reference.cc b/base/win/hstring_reference.cc index a31df77c7d8075..f82d95cdbc5bb2 100644 --- a/base/win/hstring_reference.cc +++ b/base/win/hstring_reference.cc @@ -8,7 +8,7 @@ #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/numerics/safe_conversions.h" #include "base/strings/char_traits.h" diff --git a/base/win/i18n.cc b/base/win/i18n.cc index 786ad0acc1e978..ee6f64df33a0b6 100644 --- a/base/win/i18n.cc +++ b/base/win/i18n.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check_op.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" diff --git a/base/win/iat_patch_function.cc b/base/win/iat_patch_function.cc index 07d32c54b64807..c466f0f6660e68 100644 --- a/base/win/iat_patch_function.cc +++ b/base/win/iat_patch_function.cc @@ -4,7 +4,8 @@ #include "base/win/iat_patch_function.h" -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" #include "base/win/patch_util.h" #include "base/win/pe_image.h" diff --git a/base/win/patch_util.cc b/base/win/patch_util.cc index 0026ed4b0c466a..46c1a574e0a3ab 100644 --- a/base/win/patch_util.cc +++ b/base/win/patch_util.cc @@ -4,7 +4,7 @@ #include "base/win/patch_util.h" -#include "base/logging.h" +#include "base/notreached.h" namespace base { namespace win { diff --git a/base/win/registry.cc b/base/win/registry.cc index 2d8a77262ed423..c317daf7067773 100644 --- a/base/win/registry.cc +++ b/base/win/registry.cc @@ -12,7 +12,8 @@ #include #include -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/string_util_win.h" diff --git a/base/win/resource_util.cc b/base/win/resource_util.cc index c538d6e295b146..c011a5b16734a1 100644 --- a/base/win/resource_util.cc +++ b/base/win/resource_util.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/win/resource_util.h" -#include "base/logging.h" +#include "base/notreached.h" namespace base { namespace win { diff --git a/base/win/scoped_bstr.cc b/base/win/scoped_bstr.cc index 94d7d084c268b0..6f8297400d918b 100644 --- a/base/win/scoped_bstr.cc +++ b/base/win/scoped_bstr.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check.h" #include "base/numerics/safe_conversions.h" #include "base/process/memory.h" #include "base/strings/string_util.h" diff --git a/base/win/scoped_com_initializer.cc b/base/win/scoped_com_initializer.cc index a60440347e13de..80c97495a500a2 100644 --- a/base/win/scoped_com_initializer.cc +++ b/base/win/scoped_com_initializer.cc @@ -4,7 +4,7 @@ #include "base/win/scoped_com_initializer.h" -#include "base/logging.h" +#include "base/check_op.h" namespace base { namespace win { diff --git a/base/win/scoped_hstring.cc b/base/win/scoped_hstring.cc index 0bbae1062fa9f0..5cea8b024612e1 100644 --- a/base/win/scoped_hstring.cc +++ b/base/win/scoped_hstring.cc @@ -6,7 +6,8 @@ #include -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "base/numerics/safe_conversions.h" #include "base/process/memory.h" #include "base/strings/string_piece.h" diff --git a/base/win/scoped_winrt_initializer.cc b/base/win/scoped_winrt_initializer.cc index e167e5f4a56a66..c5947527c6a453 100644 --- a/base/win/scoped_winrt_initializer.cc +++ b/base/win/scoped_winrt_initializer.cc @@ -4,7 +4,7 @@ #include "base/win/scoped_winrt_initializer.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/win/com_init_util.h" #include "base/win/core_winrt_util.h" #include "base/win/windows_version.h" diff --git a/base/win/startup_information.cc b/base/win/startup_information.cc index a78508dcad5579..c7be1ca48f6813 100644 --- a/base/win/startup_information.cc +++ b/base/win/startup_information.cc @@ -4,7 +4,6 @@ #include "base/win/startup_information.h" -#include "base/logging.h" namespace base { namespace win { diff --git a/base/win/windows_version.cc b/base/win/windows_version.cc index 0b5362819b5f4a..7ea0adf99a9f53 100644 --- a/base/win/windows_version.cc +++ b/base/win/windows_version.cc @@ -10,10 +10,11 @@ #include #include +#include "base/check_op.h" #include "base/file_version_info_win.h" #include "base/files/file_path.h" -#include "base/logging.h" #include "base/no_destructor.h" +#include "base/notreached.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" diff --git a/base/win/windows_version_unittest.cc b/base/win/windows_version_unittest.cc index 06d4cfe0ef4a4e..bd9d5048944622 100644 --- a/base/win/windows_version_unittest.cc +++ b/base/win/windows_version_unittest.cc @@ -4,7 +4,7 @@ #include "base/win/windows_version.h" -#include "base/logging.h" +#include "base/check_op.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/win/wrapped_window_proc.cc b/base/win/wrapped_window_proc.cc index 355f0e2f1f1297..a27ed899952622 100644 --- a/base/win/wrapped_window_proc.cc +++ b/base/win/wrapped_window_proc.cc @@ -5,7 +5,8 @@ #include "base/win/wrapped_window_proc.h" #include "base/atomicops.h" -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "base/strings/string_util.h" namespace {