Revert "Reland "Remove/replace unnecessary includes of logging.h (bas…

…e/)"" This reverts commit 80b8a77. Reason for revert: Findit (https://goo.gl/kROfz5) identified CL at revision 780795 as the culprit for failures in the build cycles as shown on: https://analysis.chromium.org/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtLzgwYjhhNzdhZTYzZGY1Nzk5Y2U3ZThhNDJmODRkODFiYTdmYjI5MmIM Sample Failed Build: https://ci.chromium.org/b/8876777224041482672 Sample Failed Step: compile Original change's description: > Reland "Remove/replace unnecessary includes of logging.h (base/)" > > This is a reland of a6e9e96 > > Original change's description: > > Remove/replace unnecessary includes of logging.h (base/) > > > > If the file just needs the CHECK/CHECK_OP/NOTREACHED > > macros, use the appropriate header for that instead. > > Or if logging.h is not needed at all, remove it. > > > > This is both a nice cleanup (logging.h is a big header, > > and including it unnecessarily has compile-time costs), > > and part of the final step towards making logging.h no > > longer include check.h and the others. > > > > TBR=thakis > > > > Bug: 1031540 > > Change-Id: Ib87efde411a3617fcebad6dae08313c20d63d0bd > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2254284 > > Commit-Queue: Hans Wennborg <hans@chromium.org> > > Reviewed-by: Nico Weber <thakis@chromium.org> > > Cr-Commit-Position: refs/heads/master@{#780580} > > TBR=thakis > > Bug: 1031540 > Change-Id: I0ba8608458cf14c3e4bbc86eaef4c7ad136a9263 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2256179 > Reviewed-by: Hans Wennborg <hans@chromium.org> > Commit-Queue: Hans Wennborg <hans@chromium.org> > Cr-Commit-Position: refs/heads/master@{#780795} Change-Id: If4ea98e6078918d097faa1d464e9b27ec497766d No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1031540 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2256844 Cr-Commit-Position: refs/heads/master@{#780833}
marcosholgado · Jun 22, 2020 · d2563e9 · d2563e9
1 parent dd75897
commit d2563e9
Show file tree

Hide file tree

Showing 111 changed files with 111 additions and 107 deletions.
diff --git a/base/allocator/malloc_zone_functions_mac.h b/base/allocator/malloc_zone_functions_mac.h
@@ -10,6 +10,7 @@
 
 #include "base/base_export.h"
 #include "base/immediate_crash.h"
+#include "base/logging.h"
 #include "third_party/apple_apsl/malloc.h"
 
 namespace base {

diff --git a/base/allocator/partition_allocator/oom.h b/base/allocator/partition_allocator/oom.h
@@ -6,6 +6,7 @@
 #define BASE_ALLOCATOR_PARTITION_ALLOCATOR_OOM_H_
 
 #include "base/allocator/partition_allocator/oom_callback.h"
+#include "base/logging.h"
 #include "base/process/memory.h"
 #include "build/build_config.h"
 

diff --git a/base/allocator/partition_allocator/page_allocator_internals_posix.h b/base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -9,8 +9,7 @@
 #include <sys/mman.h>
 
 #include "base/allocator/partition_allocator/partition_alloc_check.h"
-#include "base/check_op.h"
-#include "base/notreached.h"
+#include "base/logging.h"
 #include "build/build_config.h"
 
 #if defined(OS_MACOSX)

diff --git a/base/allocator/partition_allocator/page_allocator_internals_win.h b/base/allocator/partition_allocator/page_allocator_internals_win.h
@@ -8,7 +8,7 @@
 #include "base/allocator/partition_allocator/oom.h"
 #include "base/allocator/partition_allocator/page_allocator_internal.h"
 #include "base/allocator/partition_allocator/partition_alloc_check.h"
-#include "base/notreached.h"
+#include "base/logging.h"
 
 namespace base {
 

diff --git a/base/allocator/partition_allocator/partition_alloc.h b/base/allocator/partition_allocator/partition_alloc.h
@@ -67,8 +67,8 @@
 #include "base/allocator/partition_allocator/spin_lock.h"
 #include "base/base_export.h"
 #include "base/bits.h"
-#include "base/check_op.h"
 #include "base/compiler_specific.h"
+#include "base/logging.h"
 #include "base/notreached.h"
 #include "base/partition_alloc_buildflags.h"
 #include "base/stl_util.h"

diff --git a/base/allocator/partition_allocator/partition_alloc_constants.h b/base/allocator/partition_allocator/partition_alloc_constants.h
@@ -9,6 +9,7 @@
 #include <cstddef>
 
 #include "base/allocator/partition_allocator/page_allocator_constants.h"
+#include "base/logging.h"
 
 #include "build/build_config.h"
 

diff --git a/base/allocator/partition_allocator/partition_bucket.h b/base/allocator/partition_allocator/partition_bucket.h
@@ -12,8 +12,8 @@
 #include "base/allocator/partition_allocator/partition_alloc_constants.h"
 #include "base/allocator/partition_allocator/partition_alloc_forward.h"
 #include "base/base_export.h"
-#include "base/check.h"
 #include "base/compiler_specific.h"
+#include "base/logging.h"
 #include "base/thread_annotations.h"
 
 namespace base {

diff --git a/base/allocator/partition_allocator/partition_cookie.h b/base/allocator/partition_allocator/partition_cookie.h
@@ -8,6 +8,7 @@
 #include "base/allocator/buildflags.h"
 #include "base/allocator/partition_allocator/partition_alloc_check.h"
 #include "base/compiler_specific.h"
+#include "base/logging.h"
 
 namespace base {
 namespace internal {

diff --git a/base/allocator/partition_allocator/partition_direct_map_extent.h b/base/allocator/partition_allocator/partition_direct_map_extent.h
@@ -8,7 +8,7 @@
 #include "base/allocator/partition_allocator/partition_alloc_check.h"
 #include "base/allocator/partition_allocator/partition_bucket.h"
 #include "base/allocator/partition_allocator/partition_page.h"
-#include "base/check.h"
+#include "base/logging.h"
 
 namespace base {
 namespace internal {

diff --git a/base/allocator/partition_allocator/partition_page.h b/base/allocator/partition_allocator/partition_page.h
@@ -14,7 +14,7 @@
 #include "base/allocator/partition_allocator/partition_cookie.h"
 #include "base/allocator/partition_allocator/partition_freelist_entry.h"
 #include "base/allocator/partition_allocator/random.h"
-#include "base/check_op.h"
+#include "base/logging.h"
 #include "base/thread_annotations.h"
 
 namespace base {

diff --git a/base/android/scoped_java_ref.h b/base/android/scoped_java_ref.h
@@ -12,7 +12,7 @@
 #include <utility>
 
 #include "base/base_export.h"
-#include "base/check_op.h"
+#include "base/logging.h"
 #include "base/macros.h"
 
 namespace base {

diff --git a/base/bind_internal.h b/base/bind_internal.h
@@ -15,11 +15,10 @@
 
 #include "base/bind.h"
 #include "base/callback_internal.h"
-#include "base/check.h"
 #include "base/compiler_specific.h"
+#include "base/logging.h"
 #include "base/memory/raw_scoped_refptr_mismatch_checker.h"
 #include "base/memory/weak_ptr.h"
-#include "base/notreached.h"
 #include "base/template_util.h"
 #include "build/build_config.h"
 

diff --git a/base/bits.h b/base/bits.h
@@ -13,8 +13,8 @@
 
 #include <type_traits>
 
-#include "base/check.h"
 #include "base/compiler_specific.h"
+#include "base/logging.h"
 #include "build/build_config.h"
 
 #if defined(COMPILER_MSVC)

diff --git a/base/callback.h b/base/callback.h
@@ -13,7 +13,7 @@
 
 #include "base/callback_forward.h"
 #include "base/callback_internal.h"
-#include "base/notreached.h"
+#include "base/logging.h"
 
 // -----------------------------------------------------------------------------
 // Usage documentation

diff --git a/base/callback_list.h b/base/callback_list.h
@@ -14,8 +14,8 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
-#include "base/check.h"
 #include "base/compiler_specific.h"
+#include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 

diff --git a/base/cancelable_callback.h b/base/cancelable_callback.h
@@ -51,8 +51,8 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_internal.h"
-#include "base/check.h"
 #include "base/compiler_specific.h"
+#include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 

diff --git a/base/containers/checked_iterators.h b/base/containers/checked_iterators.h
@@ -9,8 +9,8 @@
 #include <memory>
 #include <type_traits>
 
-#include "base/check_op.h"
 #include "base/containers/util.h"
+#include "base/logging.h"
 
 namespace base {
 

diff --git a/base/containers/circular_deque.h b/base/containers/circular_deque.h
@@ -11,8 +11,8 @@
 #include <type_traits>
 #include <utility>
 
-#include "base/check_op.h"
 #include "base/containers/vector_buffer.h"
+#include "base/logging.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/template_util.h"

diff --git a/base/containers/flat_map.h b/base/containers/flat_map.h
@@ -9,8 +9,8 @@
 #include <tuple>
 #include <utility>
 
-#include "base/check.h"
 #include "base/containers/flat_tree.h"
+#include "base/logging.h"
 #include "base/template_util.h"
 
 namespace base {

diff --git a/base/containers/id_map.h b/base/containers/id_map.h
@@ -14,10 +14,9 @@
 #include <unordered_map>
 #include <utility>
 
-#include "base/check_op.h"
 #include "base/containers/flat_set.h"
+#include "base/logging.h"
 #include "base/macros.h"
-#include "base/notreached.h"
 #include "base/sequence_checker.h"
 
 namespace base {

diff --git a/base/containers/intrusive_heap.h b/base/containers/intrusive_heap.h
@@ -137,7 +137,7 @@
 #include <vector>
 
 #include "base/base_export.h"
-#include "base/check_op.h"
+#include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 

diff --git a/base/containers/mru_cache.h b/base/containers/mru_cache.h
@@ -25,7 +25,7 @@
 #include <unordered_map>
 #include <utility>
 
-#include "base/check.h"
+#include "base/logging.h"
 #include "base/macros.h"
 
 namespace base {

diff --git a/base/containers/ring_buffer.h b/base/containers/ring_buffer.h
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 
-#include "base/check.h"
+#include "base/logging.h"
 #include "base/macros.h"
 
 namespace base {

diff --git a/base/containers/small_map.h b/base/containers/small_map.h
@@ -14,7 +14,7 @@
 #include <unordered_map>
 #include <utility>
 
-#include "base/check_op.h"
+#include "base/logging.h"
 
 namespace {
 constexpr size_t kUsingFullMapSentinel = std::numeric_limits<size_t>::max();

diff --git a/base/containers/span.h b/base/containers/span.h
@@ -14,8 +14,8 @@
 #include <type_traits>
 #include <utility>
 
-#include "base/check_op.h"
 #include "base/containers/checked_iterators.h"
+#include "base/logging.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/template_util.h"

diff --git a/base/containers/vector_buffer.h b/base/containers/vector_buffer.h
@@ -11,8 +11,8 @@
 #include <type_traits>
 #include <utility>
 
-#include "base/check_op.h"
 #include "base/containers/util.h"
+#include "base/logging.h"
 #include "base/macros.h"
 #include "base/numerics/checked_math.h"
 

diff --git a/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc
@@ -49,11 +49,11 @@
 
 #include <ostream>
 
-#include "base/check.h"
 #include "base/debug/alias.h"
 #include "base/debug/debugging_buildflags.h"
 #include "base/environment.h"
 #include "base/files/file_util.h"
+#include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/process/process.h"
 #include "base/strings/string_number_conversions.h"

diff --git a/base/files/file_descriptor_watcher_posix.h b/base/files/file_descriptor_watcher_posix.h
@@ -9,7 +9,7 @@
 
 #include "base/base_export.h"
 #include "base/callback.h"
-#include "base/check_op.h"
+#include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"

diff --git a/base/files/file_util.h b/base/files/file_util.h
@@ -35,6 +35,7 @@
 #include "base/win/windows_types.h"
 #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
 #include "base/file_descriptor_posix.h"
+#include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #endif
 

diff --git a/base/files/important_file_writer_cleaner_unittest.cc b/base/files/important_file_writer_cleaner_unittest.cc
@@ -4,11 +4,11 @@
 
 #include "base/files/important_file_writer_cleaner.h"
 
-#include "base/check.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/logging.h"
 #include "base/optional.h"
 #include "base/process/process.h"
 #include "base/strings/stringprintf.h"

diff --git a/base/files/scoped_file.h b/base/files/scoped_file.h
@@ -10,6 +10,7 @@
 #include <memory>
 
 #include "base/base_export.h"
+#include "base/logging.h"
 #include "base/scoped_generic.h"
 #include "build/build_config.h"
 

diff --git a/base/hash/hash.h b/base/hash/hash.h
@@ -14,6 +14,7 @@
 
 #include "base/base_export.h"
 #include "base/containers/span.h"
+#include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 

diff --git a/base/hash/md5_constexpr_internal.h b/base/hash/md5_constexpr_internal.h
@@ -9,8 +9,8 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "base/check.h"
 #include "base/hash/md5.h"
+#include "base/logging.h"
 
 namespace base {
 namespace internal {

diff --git a/base/ios/weak_nsobject.h b/base/ios/weak_nsobject.h
@@ -8,8 +8,8 @@
 #import <Foundation/Foundation.h>
 #import <objc/runtime.h>
 
-#include "base/check.h"
 #include "base/compiler_specific.h"
+#include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_checker.h"
 

diff --git a/base/json/json_common.h b/base/json/json_common.h
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 
-#include "base/check_op.h"
+#include "base/logging.h"
 #include "base/macros.h"
 
 namespace base {

diff --git a/base/lazy_instance.h b/base/lazy_instance.h
@@ -48,9 +48,9 @@
 #include <new>  // For placement new.
 
 #include "base/atomicops.h"
-#include "base/check_op.h"
 #include "base/debug/leak_annotations.h"
 #include "base/lazy_instance_helpers.h"
+#include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 
 // LazyInstance uses its own struct initializer-list style static

diff --git a/base/lazy_instance_helpers.h b/base/lazy_instance_helpers.h
@@ -7,7 +7,7 @@
 
 #include "base/atomicops.h"
 #include "base/base_export.h"
-#include "base/check.h"
+#include "base/logging.h"
 
 // Helper methods used by LazyInstance and a few other base APIs for thread-safe
 // lazy construction.

diff --git a/base/mac/scoped_mach_vm.h b/base/mac/scoped_mach_vm.h
@@ -11,7 +11,7 @@
 #include <algorithm>
 
 #include "base/base_export.h"
-#include "base/check_op.h"
+#include "base/logging.h"
 #include "base/macros.h"
 
 // Use ScopedMachVM to supervise ownership of pages in the current process

diff --git a/base/mac/scoped_typeref.h b/base/mac/scoped_typeref.h
@@ -5,8 +5,8 @@
 #ifndef BASE_MAC_SCOPED_TYPEREF_H_
 #define BASE_MAC_SCOPED_TYPEREF_H_
 
-#include "base/check.h"
 #include "base/compiler_specific.h"
+#include "base/logging.h"
 #include "base/memory/scoped_policy.h"
 
 namespace base {

diff --git a/base/memory/checked_ptr.h b/base/memory/checked_ptr.h
@@ -10,8 +10,8 @@
 
 #include <utility>
 
-#include "base/check_op.h"
 #include "base/compiler_specific.h"
+#include "base/logging.h"
 #include "build/build_config.h"
 
 // TEST: We can't use protection in the real code (yet) because it may lead to

diff --git a/base/memory/discardable_shared_memory.h b/base/memory/discardable_shared_memory.h
@@ -8,7 +8,7 @@
 #include <stddef.h>
 
 #include "base/base_export.h"
-#include "base/check_op.h"
+#include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/shared_memory_mapping.h"
 #include "base/memory/unsafe_shared_memory_region.h"