Remove/replace unnecessary includes of logging.h (components/)

If the file just needs the CHECK/CHECK_OP/NOTREACHED macros, use the appropriate header for that instead. Or if logging.h is not needed at all, remove it. This is both a nice cleanup (logging.h is a big header, and including it unnecessarily has compile-time costs), and part of the final step towards making logging.h no longer include check.h and the others. Bug: 1031540 Change-Id: Ibeb7cc26e331161c5a1490b84ef5a59ecd122413 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2254029 Auto-Submit: Hans Wennborg <hans@chromium.org> Commit-Queue: Colin Blundell <blundell@chromium.org> Reviewed-by: Colin Blundell <blundell@chromium.org> Cr-Commit-Position: refs/heads/master@{#781841}
Denger-Network · Jun 24, 2020 · 29c74d3 · 29c74d3
1 parent cdf665d
commit 29c74d3
Show file tree

Hide file tree

Showing 75 changed files with 52 additions and 75 deletions.
diff --git a/components/autofill/core/browser/webdata/autofill_change.h b/components/autofill/core/browser/webdata/autofill_change.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "components/autofill/core/browser/data_model/autofill_profile.h"
 #include "components/autofill/core/browser/webdata/autofill_entry.h"
 

diff --git a/...nents/autofill_assistant/browser/devtools/devtools_api/domain_type_conversions_h.template b/...nents/autofill_assistant/browser/devtools/devtools_api/domain_type_conversions_h.template
@@ -9,7 +9,7 @@
 #ifndef COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_DEVTOOLS_DEVTOOLS_INTERNAL_TYPE_CONVERSIONS_{{domain.domain | camelcase_to_hacker_style | upper}}_H_
 #define COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_DEVTOOLS_DEVTOOLS_INTERNAL_TYPE_CONVERSIONS_{{domain.domain | camelcase_to_hacker_style | upper}}_H_
 
-#include "base/logging.h"
+#include "base/notreached.h"
 #include "components/autofill_assistant/browser/devtools/devtools/domains/types_{{domain.domain | camelcase_to_hacker_style}}.h"
 #include "components/autofill_assistant/browser/devtools/value_conversions.h"
 

diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
@@ -13,8 +13,8 @@
 #include <set>
 #include <vector>
 
+#include "base/check_op.h"
 #include "base/compiler_specific.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/memory/weak_ptr.h"

diff --git a/components/browser_watcher/activity_report_user_stream_data_source.h b/components/browser_watcher/activity_report_user_stream_data_source.h
@@ -8,7 +8,6 @@
 #include <memory>
 
 #include "base/files/file_path.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "third_party/crashpad/crashpad/handler/user_stream_data_source.h"
 

diff --git a/components/browsing_data/content/browsing_data_helper_browsertest.h b/components/browsing_data/content/browsing_data_helper_browsertest.h
@@ -9,7 +9,7 @@
 
 #include <list>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 

diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
@@ -9,7 +9,6 @@
 #include <cstring>
 
 #include "base/check_op.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "base/notreached.h"
 #include "base/optional.h"

diff --git a/components/cbor/values.h b/components/cbor/values.h
@@ -11,10 +11,11 @@
 #include <tuple>
 #include <vector>
 
+#include "base/check.h"
 #include "base/containers/flat_map.h"
 #include "base/containers/span.h"
-#include "base/logging.h"
 #include "base/macros.h"
+#include "base/notreached.h"
 #include "base/strings/string_piece.h"
 #include "components/cbor/cbor_export.h"
 

diff --git a/components/cloud_devices/common/description_items.h b/components/cloud_devices/common/description_items.h
@@ -14,7 +14,7 @@
 #include <utility>
 #include <vector>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/stl_util.h"

diff --git a/components/cloud_devices/common/printer_description.h b/components/cloud_devices/common/printer_description.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <vector>
 
-#include "base/logging.h"
 #include "build/build_config.h"
 #include "components/cloud_devices/common/description_items.h"
 

diff --git a/components/content_settings/core/browser/uma_util.h b/components/content_settings/core/browser/uma_util.h
@@ -5,7 +5,6 @@
 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_UMA_UTIL_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_UMA_UTIL_H_
 
-#include "base/logging.h"
 #include "base/macros.h"
 #include "components/content_settings/core/common/content_settings.h"
 

diff --git a/components/content_settings/core/common/pref_names.h b/components/content_settings/core/common/pref_names.h
@@ -5,7 +5,6 @@
 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_PREF_NAMES_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_PREF_NAMES_H_
 
-#include "base/logging.h"
 
 namespace prefs {
 

diff --git a/components/cronet/native/test/test_request_finished_info_listener.h b/components/cronet/native/test/test_request_finished_info_listener.h
@@ -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/check.h"
 #include "base/synchronization/waitable_event.h"
 #include "cronet_c.h"
 

diff --git a/components/cronet/tools/generators/c_templates/module_impl_interface.cc.tmpl b/components/cronet/tools/generators/c_templates/module_impl_interface.cc.tmpl
@@ -14,7 +14,7 @@
 
 #include "{{variant_path}}_impl_interface.h"
 
-#include "base/logging.h"
+#include "base/check.h"
 
 {#--- Interface Stubs -#}
 {%  for interface in interfaces %}

diff --git a/components/cronet/tools/generators/c_templates/module_impl_interface_unittest.cc.tmpl b/components/cronet/tools/generators/c_templates/module_impl_interface_unittest.cc.tmpl
@@ -14,7 +14,7 @@
 
 #include "{{variant_path}}_c.h"
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/components/cronet/tools/generators/c_templates/module_impl_struct.cc.tmpl b/components/cronet/tools/generators/c_templates/module_impl_struct.cc.tmpl
@@ -15,7 +15,7 @@
 
 #include <utility>
 
-#include "base/logging.h"
+#include "base/check.h"
 
 {%- for struct in structs %}
 {%- set struct_name = struct|get_name_for_kind %}

diff --git a/components/cronet/tools/generators/c_templates/module_impl_struct_unittest.cc.tmpl b/components/cronet/tools/generators/c_templates/module_impl_struct_unittest.cc.tmpl
@@ -14,7 +14,6 @@
 
 #include <math.h>
 
-#include "base/logging.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/components/download/public/common/base_file.h b/components/download/public/common/base_file.h
@@ -13,10 +13,10 @@
 
 #include "base/callback.h"
 #include "base/callback_forward.h"
+#include "base/check.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"

diff --git a/components/embedder_support/android/view/content_view_render_view.h b/components/embedder_support/android/view/content_view_render_view.h
@@ -8,7 +8,6 @@
 #include <memory>
 
 #include "base/android/jni_weak_ref.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/android/compositor_client.h"

diff --git a/components/exo/wayland/fuzzer/harness.cc.tmpl b/components/exo/wayland/fuzzer/harness.cc.tmpl
@@ -16,7 +16,7 @@
 #include <cstring>
 #include <functional>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "components/exo/wayland/fuzzer/actions.pb.h"
 
 namespace exo {

diff --git a/components/gcm_driver/crypto/message_payload_parser.h b/components/gcm_driver/crypto/message_payload_parser.h
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "base/macros.h"
 #include "base/optional.h"
 #include "base/strings/string_piece.h"

diff --git a/components/history/core/browser/history_service.h b/components/history/core/browser/history_service.h
@@ -17,11 +17,11 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_list.h"
+#include "base/check.h"
 #include "base/containers/flat_set.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"

diff --git a/components/media_message_center/vector_icons/vector_icons.cc.template b/components/media_message_center/vector_icons/vector_icons.cc.template
@@ -7,7 +7,6 @@
 
 #include "components/media_message_center/vector_icons/vector_icons.h"
 
-#include "base/logging.h"
 #include "components/vector_icons/cc_macros.h"
 #include "ui/gfx/vector_icon_types.h"
 

diff --git a/components/offline_pages/core/prefetch/prefetch_service_test_taco.h b/components/offline_pages/core/prefetch/prefetch_service_test_taco.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/prefs/pref_service.h"

diff --git a/components/omnibox/browser/vector_icons/vector_icons.cc.template b/components/omnibox/browser/vector_icons/vector_icons.cc.template
@@ -7,7 +7,6 @@
 
 #include "components/omnibox/browser/vector_icons.h"
 
-#include "base/logging.h"
 #include "components/vector_icons/cc_macros.h"
 #include "ui/gfx/vector_icon_types.h"
 

diff --git a/components/optimization_guide/url_pattern_with_wildcards.h b/components/optimization_guide/url_pattern_with_wildcards.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <vector>
 
-#include "base/logging.h"
 #include "base/macros.h"
 
 namespace optimization_guide {

diff --git a/components/page_load_metrics/browser/observers/use_counter_page_load_metrics_observer.h b/components/page_load_metrics/browser/observers/use_counter_page_load_metrics_observer.h
@@ -7,7 +7,6 @@
 
 #include <bitset>
 #include "base/containers/flat_set.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "components/page_load_metrics/browser/page_load_metrics_observer.h"
 #include "third_party/blink/public/mojom/use_counter/css_property_id.mojom.h"

diff --git a/components/password_manager/core/browser/android_affiliation/affiliation_utils.h b/components/password_manager/core/browser/android_affiliation/affiliation_utils.h
@@ -49,7 +49,7 @@
 #include <string>
 #include <vector>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "url/gurl.h"

diff --git a/components/payments/content/android/byte_buffer_helper.h b/components/payments/content/android/byte_buffer_helper.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/android/scoped_java_ref.h"
-#include "base/logging.h"
+#include "base/check.h"
 #include "mojo/public/cpp/bindings/struct_ptr.h"
 
 namespace payments {

diff --git a/components/performance_manager/graph/node_attached_data.h b/components/performance_manager/graph/node_attached_data.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/macros.h"
 #include "components/performance_manager/graph/node_base.h"
 #include "components/performance_manager/public/graph/node_attached_data.h"

diff --git a/components/performance_manager/graph/node_attached_data_impl.h b/components/performance_manager/graph/node_attached_data_impl.h
@@ -9,7 +9,7 @@
 #include <type_traits>
 #include <utility>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/memory/ptr_util.h"
 #include "components/performance_manager/graph/node_attached_data.h"
 

diff --git a/components/performance_manager/owned_objects.h b/components/performance_manager/owned_objects.h
@@ -7,9 +7,9 @@
 
 #include <memory>
 
+#include "base/check_op.h"
 #include "base/containers/flat_set.h"
 #include "base/containers/unique_ptr_adapters.h"
-#include "base/logging.h"
 #include "base/stl_util.h"
 
 namespace performance_manager {

diff --git a/components/performance_manager/public/graph/node_attached_data.h b/components/performance_manager/public/graph/node_attached_data.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/macros.h"
 
 namespace performance_manager {

diff --git a/components/performance_manager/registered_objects.h b/components/performance_manager/registered_objects.h
@@ -7,8 +7,8 @@
 
 #include <type_traits>
 
+#include "base/check_op.h"
 #include "base/containers/flat_set.h"
-#include "base/logging.h"
 
 namespace performance_manager {
 

diff --git a/components/performance_manager/service_worker_context_adapter.h b/components/performance_manager/service_worker_context_adapter.h
@@ -8,9 +8,9 @@
 #include <memory>
 #include <string>
 
+#include "base/check_op.h"
 #include "base/containers/flat_map.h"
 #include "base/containers/flat_set.h"
-#include "base/logging.h"
 #include "base/observer_list.h"
 #include "base/scoped_observer.h"
 #include "content/public/browser/service_worker_context.h"

diff --git a/components/performance_manager/worker_watcher.h b/components/performance_manager/worker_watcher.h
@@ -8,9 +8,9 @@
 #include <memory>
 #include <string>
 
+#include "base/check_op.h"
 #include "base/containers/flat_map.h"
 #include "base/containers/flat_set.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "base/sequence_checker.h"

diff --git a/components/policy/core/common/cloud/dm_auth.h b/components/policy/core/common/cloud/dm_auth.h
@@ -7,7 +7,7 @@
 #include <memory>
 #include <string>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/macros.h"
 #include "components/policy/policy_export.h"
 

diff --git a/components/policy/core/common/cloud/policy_builder.h b/components/policy/core/common/cloud/policy_builder.h
@@ -11,8 +11,8 @@
 #include <string>
 #include <vector>
 
+#include "base/check.h"
 #include "base/compiler_specific.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "components/account_id/account_id.h"

diff --git a/components/policy/core/common/schema_map.cc b/components/policy/core/common/schema_map.cc
@@ -4,7 +4,6 @@
 
 #include "components/policy/core/common/schema_map.h"
 
-#include "base/logging.h"
 #include "base/values.h"
 #include "components/policy/core/common/policy_bundle.h"
 #include "components/policy/core/common/policy_map.h"

diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py
@@ -1032,7 +1032,7 @@ def _WritePolicyConstantSource(policies, policy_atomic_groups, target_platform,
 #include <climits>
 #include <memory>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/stl_util.h"  // base::size()
 #include "build/branding_buildflags.h"
 #include "components/policy/core/common/policy_types.h"

diff --git a/components/prefs/pref_member.h b/components/prefs/pref_member.h
@@ -29,8 +29,8 @@
 
 #include "base/bind.h"
 #include "base/callback_forward.h"
+#include "base/check.h"
 #include "base/files/file_path.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner.h"

diff --git a/components/previews/core/previews_experiments.cc b/components/previews/core/previews_experiments.cc
@@ -6,9 +6,9 @@
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
-#include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/field_trial_params.h"
+#include "base/notreached.h"
 #include "base/optional.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"

diff --git a/components/services/storage/indexed_db/scopes/leveldb_scope.h b/components/services/storage/indexed_db/scopes/leveldb_scope.h
@@ -12,9 +12,9 @@
 #include <vector>
 
 #include "base/callback.h"
+#include "base/check_op.h"
 #include "base/compiler_specific.h"
 #include "base/containers/flat_map.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/numerics/checked_math.h"

diff --git a/components/services/storage/indexed_db/scopes/scope_lock.h b/components/services/storage/indexed_db/scopes/scope_lock.h
@@ -10,7 +10,6 @@
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "components/services/storage/indexed_db/scopes/scope_lock_range.h"
 #include "third_party/leveldatabase/src/include/leveldb/comparator.h"