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 <hans@chromium.org> Auto-Submit: Hans Wennborg <hans@chromium.org> Reviewed-by: kylechar <kylechar@chromium.org> Reviewed-by: Matthew Denton <mpdenton@chromium.org> Cr-Commit-Position: refs/heads/master@{#762782}
marcosholgado · Apr 27, 2020 · c3cffa6 · c3cffa6
1 parent ea26a79
commit c3cffa6
Show file tree

Hide file tree

Showing 224 changed files with 253 additions and 224 deletions.
diff --git 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
@@ -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
@@ -4,8 +4,10 @@
 
 #include "base/allocator/allocator_shim.h"
 
+#include <ostream>
+
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,8 +6,8 @@
 #include <stdio.h>
 
 #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
@@ -16,7 +16,7 @@
 #include <limits>
 
 #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
@@ -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
@@ -7,7 +7,7 @@
 #include <dlfcn.h>
 
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,6 @@
 #include <utility>
 
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
 #include <string>
 
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <ostream>
+
+#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
@@ -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
@@ -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
@@ -7,10 +7,10 @@
 #include <algorithm>
 #include <utility>
 
+#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
@@ -8,8 +8,8 @@
 
 #include <memory>
 
+#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
@@ -17,8 +17,9 @@
 #include <memory>
 #include <vector>
 
+#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
@@ -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
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <windows.h>
 
-#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
@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <sstream>
 
-#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
@@ -7,7 +7,7 @@
 #include <utility>
 
 #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
@@ -9,8 +9,8 @@
 
 #include <utility>
 
+#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
@@ -11,8 +11,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#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"