Remove/replace unnecessary logging.h includes in .cc files (components)
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: I1c0c8450be6320577ebebe39a2cb1abc692fe8b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2164613
Commit-Queue: Hans Wennborg <[email protected]>
Auto-Submit: Hans Wennborg <[email protected]>
Reviewed-by: Ted Choc <[email protected]>
Reviewed-by: Mike West <[email protected]>
Cr-Commit-Position: refs/heads/master@{#763287}
diff --git a/components/arc/arc_service_manager.cc b/components/arc/arc_service_manager.cc
index 60784f4bd..aceaeb45 100644
--- a/components/arc/arc_service_manager.cc
+++ b/components/arc/arc_service_manager.cc
@@ -4,7 +4,7 @@
#include "components/arc/arc_service_manager.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/arc/session/arc_bridge_service.h"
#include "components/arc/session/arc_session.h"
#include "components/arc/session/arc_session_runner.h"
diff --git a/components/arc/file_system/file_system_mojom_traits.cc b/components/arc/file_system/file_system_mojom_traits.cc
index 9af0c129..b1a569ad 100644
--- a/components/arc/file_system/file_system_mojom_traits.cc
+++ b/components/arc/file_system/file_system_mojom_traits.cc
@@ -4,7 +4,7 @@
#include "components/arc/file_system/file_system_mojom_traits.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "components/arc/mojom/file_system.mojom.h"
namespace mojo {
diff --git a/components/arc/lock_screen/arc_lock_screen_bridge.cc b/components/arc/lock_screen/arc_lock_screen_bridge.cc
index 9def23d0..41b6db2 100644
--- a/components/arc/lock_screen/arc_lock_screen_bridge.cc
+++ b/components/arc/lock_screen/arc_lock_screen_bridge.cc
@@ -5,7 +5,6 @@
#include "components/arc/lock_screen/arc_lock_screen_bridge.h"
#include "base/bind.h"
-#include "base/logging.h"
#include "base/memory/singleton.h"
#include "base/threading/thread_task_runner_handle.h"
#include "components/arc/arc_browser_context_keyed_service_factory_base.h"
diff --git a/components/arc/net/always_on_vpn_manager_unittest.cc b/components/arc/net/always_on_vpn_manager_unittest.cc
index dd5138b..70acc7d 100644
--- a/components/arc/net/always_on_vpn_manager_unittest.cc
+++ b/components/arc/net/always_on_vpn_manager_unittest.cc
@@ -5,7 +5,6 @@
#include "components/arc/net/always_on_vpn_manager.h"
#include "base/bind.h"
-#include "base/logging.h"
#include "base/run_loop.h"
#include "base/values.h"
#include "chromeos/dbus/dbus_method_call_status.h"
diff --git a/components/arc/session/arc_instance_mode.cc b/components/arc/session/arc_instance_mode.cc
index e76a11e..993c70b 100644
--- a/components/arc/session/arc_instance_mode.cc
+++ b/components/arc/session/arc_instance_mode.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/logging.h"
+#include "base/notreached.h"
namespace arc {
namespace {
diff --git a/components/arc/session/arc_supervision_transition.cc b/components/arc/session/arc_supervision_transition.cc
index 8eddefb..359aeb2 100644
--- a/components/arc/session/arc_supervision_transition.cc
+++ b/components/arc/session/arc_supervision_transition.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "components/arc/session/arc_supervision_transition.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace arc {
diff --git a/components/arc/storage_manager/arc_storage_manager.cc b/components/arc/storage_manager/arc_storage_manager.cc
index 1d71931..2e2d71c 100644
--- a/components/arc/storage_manager/arc_storage_manager.cc
+++ b/components/arc/storage_manager/arc_storage_manager.cc
@@ -8,7 +8,6 @@
#include <vector>
#include "base/bind.h"
-#include "base/logging.h"
#include "base/memory/singleton.h"
#include "components/arc/arc_browser_context_keyed_service_factory_base.h"
#include "components/arc/session/arc_bridge_service.h"
diff --git a/components/arc/test/fake_arc_session.cc b/components/arc/test/fake_arc_session.cc
index 08d5b9e..714ca63 100644
--- a/components/arc/test/fake_arc_session.cc
+++ b/components/arc/test/fake_arc_session.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check.h"
namespace arc {
diff --git a/components/arc/volume_mounter/volume_mounter_mojom_traits.cc b/components/arc/volume_mounter/volume_mounter_mojom_traits.cc
index 54299f5..606d4510 100644
--- a/components/arc/volume_mounter/volume_mounter_mojom_traits.cc
+++ b/components/arc/volume_mounter/volume_mounter_mojom_traits.cc
@@ -4,7 +4,7 @@
#include "components/arc/volume_mounter/volume_mounter_mojom_traits.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace mojo {
diff --git a/components/assist_ranker/nn_classifier.cc b/components/assist_ranker/nn_classifier.cc
index cd58a0f..7dbe9577 100644
--- a/components/assist_ranker/nn_classifier.cc
+++ b/components/assist_ranker/nn_classifier.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "components/assist_ranker/nn_classifier.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/assist_ranker/proto/nn_classifier.pb.h"
namespace assist_ranker {
diff --git a/components/assist_ranker/nn_classifier_unittest.cc b/components/assist_ranker/nn_classifier_unittest.cc
index c080eb3..aadd6378 100644
--- a/components/assist_ranker/nn_classifier_unittest.cc
+++ b/components/assist_ranker/nn_classifier_unittest.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "components/assist_ranker/nn_classifier.h"
-#include "base/logging.h"
#include "components/assist_ranker/nn_classifier_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/assist_ranker/quantized_nn_classifier.cc b/components/assist_ranker/quantized_nn_classifier.cc
index 62bd8ed..b1f0a0f 100644
--- a/components/assist_ranker/quantized_nn_classifier.cc
+++ b/components/assist_ranker/quantized_nn_classifier.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "components/assist_ranker/quantized_nn_classifier.h"
-#include "base/logging.h"
#include "components/assist_ranker/nn_classifier.h"
namespace assist_ranker {
diff --git a/components/assist_ranker/quantized_nn_classifier_unittest.cc b/components/assist_ranker/quantized_nn_classifier_unittest.cc
index 3661431..411f9b3 100644
--- a/components/assist_ranker/quantized_nn_classifier_unittest.cc
+++ b/components/assist_ranker/quantized_nn_classifier_unittest.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "components/assist_ranker/quantized_nn_classifier.h"
-#include "base/logging.h"
#include "components/assist_ranker/nn_classifier.h"
#include "components/assist_ranker/nn_classifier_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/content/browser/risk/fingerprint.cc b/components/autofill/content/browser/risk/fingerprint.cc
index 863413b6..35475b3 100644
--- a/components/autofill/content/browser/risk/fingerprint.cc
+++ b/components/autofill/content/browser/risk/fingerprint.cc
@@ -16,8 +16,8 @@
#include "base/bind.h"
#include "base/callback.h"
+#include "base/check.h"
#include "base/cpu.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observer.h"
diff --git a/components/autofill/content/renderer/field_data_manager.cc b/components/autofill/content/renderer/field_data_manager.cc
index 8111c01..769184ffb 100644
--- a/components/autofill/content/renderer/field_data_manager.cc
+++ b/components/autofill/content/renderer/field_data_manager.cc
@@ -4,8 +4,8 @@
#include "components/autofill/content/renderer/field_data_manager.h"
+#include "base/check.h"
#include "base/i18n/case_conversion.h"
-#include "base/logging.h"
#include "third_party/blink/public/web/web_form_control_element.h"
namespace autofill {
diff --git a/components/autofill/content/renderer/form_autofill_util.cc b/components/autofill/content/renderer/form_autofill_util.cc
index a041faa..e564a7d4 100644
--- a/components/autofill/content/renderer/form_autofill_util.cc
+++ b/components/autofill/content/renderer/form_autofill_util.cc
@@ -13,12 +13,13 @@
#include <utility>
#include <vector>
+#include "base/check_op.h"
#include "base/command_line.h"
#include "base/i18n/case_conversion.h"
-#include "base/logging.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram_macros.h"
#include "base/no_destructor.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
diff --git a/components/autofill/content/renderer/form_cache.cc b/components/autofill/content/renderer/form_cache.cc
index 3dde13e..f4db2a0a 100644
--- a/components/autofill/content/renderer/form_cache.cc
+++ b/components/autofill/content/renderer/form_cache.cc
@@ -9,8 +9,8 @@
#include <string>
#include <utility>
+#include "base/check_op.h"
#include "base/feature_list.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/stl_util.h"
#include "base/strings/strcat.h"
diff --git a/components/autofill/content/renderer/password_generation_agent.cc b/components/autofill/content/renderer/password_generation_agent.cc
index d30ea29..250db30 100644
--- a/components/autofill/content/renderer/password_generation_agent.cc
+++ b/components/autofill/content/renderer/password_generation_agent.cc
@@ -10,8 +10,8 @@
#include "base/auto_reset.h"
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/command_line.h"
-#include "base/logging.h"
#include "base/stl_util.h"
#include "base/threading/thread_task_runner_handle.h"
#include "components/autofill/content/renderer/form_autofill_util.h"
diff --git a/components/autofill/core/browser/address_normalizer_impl.cc b/components/autofill/core/browser/address_normalizer_impl.cc
index e816a6e..85ff881f 100644
--- a/components/autofill/core/browser/address_normalizer_impl.cc
+++ b/components/autofill/core/browser/address_normalizer_impl.cc
@@ -10,8 +10,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/cancelable_callback.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/post_task.h"
diff --git a/components/autofill/core/browser/autofill_address_util.cc b/components/autofill/core/browser/autofill_address_util.cc
index e621752b..2f22732f 100644
--- a/components/autofill/core/browser/autofill_address_util.cc
+++ b/components/autofill/core/browser/autofill_address_util.cc
@@ -7,8 +7,9 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/ptr_util.h"
+#include "base/notreached.h"
#include "base/values.h"
#include "components/autofill/core/browser/geo/autofill_country.h"
#include "components/autofill/core/browser/ui/country_combobox_model.h"
diff --git a/components/autofill/core/browser/autofill_external_delegate.cc b/components/autofill/core/browser/autofill_external_delegate.cc
index 57176a98..27b3c5a 100644
--- a/components/autofill/core/browser/autofill_external_delegate.cc
+++ b/components/autofill/core/browser/autofill_external_delegate.cc
@@ -9,10 +9,11 @@
#include <utility>
#include "base/bind.h"
+#include "base/check.h"
#include "base/command_line.h"
#include "base/feature_list.h"
#include "base/i18n/case_conversion.h"
-#include "base/logging.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/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc b/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
index eda4c15..9a95132 100644
--- a/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
+++ b/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
@@ -10,8 +10,8 @@
#include <string>
#include <vector>
+#include "base/check.h"
#include "base/compiler_specific.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/strings/string16.h"
#include "base/win/registry.h"
diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
index 70964274..6e4f89b 100644
--- a/components/autofill/core/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
@@ -17,16 +17,17 @@
#include <vector>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/command_line.h"
#include "base/containers/adapters.h"
#include "base/feature_list.h"
#include "base/files/file_util.h"
#include "base/guid.h"
#include "base/i18n/rtl.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/metrics/histogram_functions.h"
+#include "base/notreached.h"
#include "base/path_service.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
diff --git a/components/autofill/core/browser/autofill_profile_validation_util.cc b/components/autofill/core/browser/autofill_profile_validation_util.cc
index 22a5d90..14f084dc 100644
--- a/components/autofill/core/browser/autofill_profile_validation_util.cc
+++ b/components/autofill/core/browser/autofill_profile_validation_util.cc
@@ -7,8 +7,8 @@
#include <string>
#include <utility>
+#include "base/check.h"
#include "base/i18n/case_conversion.h"
-#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/browser/geo/address_i18n.h"
diff --git a/components/autofill/core/browser/autofill_profile_validator.cc b/components/autofill/core/browser/autofill_profile_validator.cc
index 9d510d9..e175fad 100644
--- a/components/autofill/core/browser/autofill_profile_validator.cc
+++ b/components/autofill/core/browser/autofill_profile_validator.cc
@@ -10,7 +10,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/cancelable_callback.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "base/time/time.h"
diff --git a/components/autofill/core/browser/autofill_type.cc b/components/autofill/core/browser/autofill_type.cc
index 4d0d4241..19e9cbf 100644
--- a/components/autofill/core/browser/autofill_type.cc
+++ b/components/autofill/core/browser/autofill_type.cc
@@ -4,7 +4,7 @@
#include "components/autofill/core/browser/autofill_type.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace autofill {
diff --git a/components/autofill/core/browser/data_model/address.cc b/components/autofill/core/browser/data_model/address.cc
index dbe5cdd..788c1f7 100644
--- a/components/autofill/core/browser/data_model/address.cc
+++ b/components/autofill/core/browser/data_model/address.cc
@@ -7,8 +7,9 @@
#include <stddef.h>
#include <algorithm>
+#include "base/check_op.h"
#include "base/i18n/case_conversion.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
diff --git a/components/autofill/core/browser/data_model/contact_info.cc b/components/autofill/core/browser/data_model/contact_info.cc
index 0182be5d..fc97e3e 100644
--- a/components/autofill/core/browser/data_model/contact_info.cc
+++ b/components/autofill/core/browser/data_model/contact_info.cc
@@ -8,8 +8,9 @@
#include <ostream>
#include <string>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
+#include "base/notreached.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/browser/autofill_data_util.h"
diff --git a/components/autofill/core/browser/data_model/credit_card.cc b/components/autofill/core/browser/data_model/credit_card.cc
index fdded38..4b42be5 100644
--- a/components/autofill/core/browser/data_model/credit_card.cc
+++ b/components/autofill/core/browser/data_model/credit_card.cc
@@ -11,12 +11,13 @@
#include <ostream>
#include <string>
+#include "base/check_op.h"
#include "base/guid.h"
#include "base/i18n/rtl.h"
#include "base/i18n/time_formatting.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
diff --git a/components/autofill/core/browser/data_model/phone_number.cc b/components/autofill/core/browser/data_model/phone_number.cc
index 47f4e812..4327531 100644
--- a/components/autofill/core/browser/data_model/phone_number.cc
+++ b/components/autofill/core/browser/data_model/phone_number.cc
@@ -6,7 +6,8 @@
#include <algorithm>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/autofill/core/browser/form_parsing/address_field.cc b/components/autofill/core/browser/form_parsing/address_field.cc
index c399d89a..3109f04 100644
--- a/components/autofill/core/browser/form_parsing/address_field.cc
+++ b/components/autofill/core/browser/form_parsing/address_field.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/autofill/core/browser/form_parsing/autofill_scanner.cc b/components/autofill/core/browser/form_parsing/autofill_scanner.cc
index 5d61c428..4f18d7e3 100644
--- a/components/autofill/core/browser/form_parsing/autofill_scanner.cc
+++ b/components/autofill/core/browser/form_parsing/autofill_scanner.cc
@@ -4,7 +4,8 @@
#include "components/autofill/core/browser/form_parsing/autofill_scanner.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "components/autofill/core/browser/autofill_field.h"
namespace autofill {
diff --git a/components/autofill/core/browser/form_parsing/form_field.cc b/components/autofill/core/browser/form_parsing/form_field.cc
index d801580..cdf5a7ff 100644
--- a/components/autofill/core/browser/form_parsing/form_field.cc
+++ b/components/autofill/core/browser/form_parsing/form_field.cc
@@ -11,7 +11,6 @@
#include <string>
#include <utility>
-#include "base/logging.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
diff --git a/components/autofill/core/browser/form_parsing/phone_field.cc b/components/autofill/core/browser/form_parsing/phone_field.cc
index 69176080..84b164d 100644
--- a/components/autofill/core/browser/form_parsing/phone_field.cc
+++ b/components/autofill/core/browser/form_parsing/phone_field.cc
@@ -9,7 +9,8 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
diff --git a/components/autofill/core/browser/geo/address_i18n.cc b/components/autofill/core/browser/geo/address_i18n.cc
index 62be348d..d02f02c 100644
--- a/components/autofill/core/browser/geo/address_i18n.cc
+++ b/components/autofill/core/browser/geo/address_i18n.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_split.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/browser/autofill_type.h"
diff --git a/components/autofill/core/browser/geo/autofill_country.cc b/components/autofill/core/browser/geo/autofill_country.cc
index aeab954..43a02de2 100644
--- a/components/autofill/core/browser/geo/autofill_country.cc
+++ b/components/autofill/core/browser/geo/autofill_country.cc
@@ -6,7 +6,6 @@
#include <stddef.h>
-#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "components/autofill/core/browser/geo/country_data.h"
diff --git a/components/autofill/core/browser/geo/country_names.cc b/components/autofill/core/browser/geo/country_names.cc
index a91e6f3..059440d 100644
--- a/components/autofill/core/browser/geo/country_names.cc
+++ b/components/autofill/core/browser/geo/country_names.cc
@@ -8,8 +8,8 @@
#include <memory>
+#include "base/check_op.h"
#include "base/lazy_instance.h"
-#include "base/logging.h"
#include "base/memory/singleton.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
diff --git a/components/autofill/core/browser/geo/phone_number_i18n.cc b/components/autofill/core/browser/geo/phone_number_i18n.cc
index 3853bfe0..0e1d01e 100644
--- a/components/autofill/core/browser/geo/phone_number_i18n.cc
+++ b/components/autofill/core/browser/geo/phone_number_i18n.cc
@@ -6,7 +6,8 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
diff --git a/components/autofill/core/browser/payments/autofill_save_card_infobar_delegate_mobile.cc b/components/autofill/core/browser/payments/autofill_save_card_infobar_delegate_mobile.cc
index 099b583..eab6f8bc 100644
--- a/components/autofill/core/browser/payments/autofill_save_card_infobar_delegate_mobile.cc
+++ b/components/autofill/core/browser/payments/autofill_save_card_infobar_delegate_mobile.cc
@@ -6,7 +6,8 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "build/branding_buildflags.h"
diff --git a/components/autofill/core/browser/payments/full_card_request.cc b/components/autofill/core/browser/payments/full_card_request.cc
index 0ee0e45..32fda57 100644
--- a/components/autofill/core/browser/payments/full_card_request.cc
+++ b/components/autofill/core/browser/payments/full_card_request.cc
@@ -5,7 +5,8 @@
#include "components/autofill/core/browser/payments/full_card_request.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "components/autofill/core/browser/autofill_metrics.h"
diff --git a/components/autofill/core/browser/payments/legal_message_line.cc b/components/autofill/core/browser/payments/legal_message_line.cc
index df208c2..e34143f 100644
--- a/components/autofill/core/browser/payments/legal_message_line.cc
+++ b/components/autofill/core/browser/payments/legal_message_line.cc
@@ -4,8 +4,8 @@
#include "components/autofill/core/browser/payments/legal_message_line.h"
+#include "base/check.h"
#include "base/i18n/message_formatter.h"
-#include "base/logging.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
diff --git a/components/autofill/core/browser/payments/legal_message_line_unittest.cc b/components/autofill/core/browser/payments/legal_message_line_unittest.cc
index 02aa522a..257e22c 100644
--- a/components/autofill/core/browser/payments/legal_message_line_unittest.cc
+++ b/components/autofill/core/browser/payments/legal_message_line_unittest.cc
@@ -8,8 +8,8 @@
#include <string>
#include <utility>
+#include "base/check_op.h"
#include "base/json/json_reader.h"
-#include "base/logging.h"
#include "base/no_destructor.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
diff --git a/components/autofill/core/browser/payments/upi_vpa_save_manager.cc b/components/autofill/core/browser/payments/upi_vpa_save_manager.cc
index a6f8019..feb7d86b 100644
--- a/components/autofill/core/browser/payments/upi_vpa_save_manager.cc
+++ b/components/autofill/core/browser/payments/upi_vpa_save_manager.cc
@@ -4,7 +4,6 @@
#include "components/autofill/core/browser/payments/upi_vpa_save_manager.h"
-#include "base/logging.h"
#include "build/build_config.h"
namespace autofill {
diff --git a/components/autofill/core/browser/rationalization_util.cc b/components/autofill/core/browser/rationalization_util.cc
index 45342f7..10fea57a 100644
--- a/components/autofill/core/browser/rationalization_util.cc
+++ b/components/autofill/core/browser/rationalization_util.cc
@@ -4,7 +4,7 @@
#include "components/autofill/core/browser/rationalization_util.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/autofill/core/browser/autofill_field.h"
#include "components/autofill/core/browser/autofill_type.h"
diff --git a/components/autofill/core/browser/ui/accessory_sheet_data.cc b/components/autofill/core/browser/ui/accessory_sheet_data.cc
index 1728083a..fd1a0d9 100644
--- a/components/autofill/core/browser/ui/accessory_sheet_data.cc
+++ b/components/autofill/core/browser/ui/accessory_sheet_data.cc
@@ -4,7 +4,6 @@
#include "components/autofill/core/browser/ui/accessory_sheet_data.h"
-#include "base/logging.h"
#include "base/strings/string_piece.h"
#include "components/autofill/core/browser/ui/accessory_sheet_enums.h"
diff --git a/components/autofill/core/browser/ui/country_combobox_model.cc b/components/autofill/core/browser/ui/country_combobox_model.cc
index 1b032490..b15cc2b 100644
--- a/components/autofill/core/browser/ui/country_combobox_model.cc
+++ b/components/autofill/core/browser/ui/country_combobox_model.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "components/autofill/core/browser/geo/autofill_country.h"
diff --git a/components/autofill/core/browser/ui/mobile_label_formatter.cc b/components/autofill/core/browser/ui/mobile_label_formatter.cc
index 21ef4800..6d5bb31 100644
--- a/components/autofill/core/browser/ui/mobile_label_formatter.cc
+++ b/components/autofill/core/browser/ui/mobile_label_formatter.cc
@@ -6,8 +6,8 @@
#include <algorithm>
-#include "base/logging.h"
#include "base/metrics/field_trial_params.h"
+#include "base/notreached.h"
#include "components/autofill/core/browser/autofill_data_util.h"
#include "components/autofill/core/browser/ui/label_formatter_utils.h"
#include "components/autofill/core/common/autofill_features.h"
diff --git a/components/autofill/core/browser/ui/payments/card_expiration_date_fix_flow_controller_impl.cc b/components/autofill/core/browser/ui/payments/card_expiration_date_fix_flow_controller_impl.cc
index d976971..a5a81c6 100644
--- a/components/autofill/core/browser/ui/payments/card_expiration_date_fix_flow_controller_impl.cc
+++ b/components/autofill/core/browser/ui/payments/card_expiration_date_fix_flow_controller_impl.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "build/branding_buildflags.h"
diff --git a/components/autofill/core/browser/ui/payments/card_name_fix_flow_controller_impl.cc b/components/autofill/core/browser/ui/payments/card_name_fix_flow_controller_impl.cc
index ea355c2f..df41801 100644
--- a/components/autofill/core/browser/ui/payments/card_name_fix_flow_controller_impl.cc
+++ b/components/autofill/core/browser/ui/payments/card_name_fix_flow_controller_impl.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
diff --git a/components/autofill/core/browser/validation.cc b/components/autofill/core/browser/validation.cc
index 8363a41..3256986 100644
--- a/components/autofill/core/browser/validation.cc
+++ b/components/autofill/core/browser/validation.cc
@@ -6,7 +6,8 @@
#include <stddef.h>
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
diff --git a/components/autofill/core/browser/webdata/autofill_change.cc b/components/autofill/core/browser/webdata/autofill_change.cc
index f9a498e7..c721bf93 100644
--- a/components/autofill/core/browser/webdata/autofill_change.cc
+++ b/components/autofill/core/browser/webdata/autofill_change.cc
@@ -4,7 +4,6 @@
#include "components/autofill/core/browser/webdata/autofill_change.h"
-#include "base/logging.h"
namespace autofill {
diff --git a/components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge.cc b/components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge.cc
index 29505c4..56e5daeb 100644
--- a/components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge.cc
+++ b/components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge.cc
@@ -10,7 +10,8 @@
#include <vector>
#include "base/base64.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/optional.h"
#include "base/pickle.h"
#include "components/autofill/core/browser/data_model/autofill_metadata.h"
diff --git a/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.cc b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.cc
index db59ef46..c761b0d 100644
--- a/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.cc
+++ b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.cc
@@ -5,8 +5,9 @@
#include "components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h"
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "components/autofill/core/browser/data_model/autofill_profile.h"
#include "components/autofill/core/browser/data_model/credit_card.h"
diff --git a/components/autofill/core/browser/webdata/autofill_webdata_backend_util.cc b/components/autofill/core/browser/webdata/autofill_webdata_backend_util.cc
index 82861870..e931d4c 100644
--- a/components/autofill/core/browser/webdata/autofill_webdata_backend_util.cc
+++ b/components/autofill/core/browser/webdata/autofill_webdata_backend_util.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/browser/autofill_metrics.h"
diff --git a/components/autofill/core/browser/webdata/autofill_webdata_service.cc b/components/autofill/core/browser/webdata/autofill_webdata_service.cc
index 445e657..1f322da 100644
--- a/components/autofill/core/browser/webdata/autofill_webdata_service.cc
+++ b/components/autofill/core/browser/webdata/autofill_webdata_service.cc
@@ -5,8 +5,8 @@
#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
#include "base/bind.h"
+#include "base/check.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "components/autofill/core/browser/data_model/autofill_profile.h"
diff --git a/components/autofill/core/common/autofill_regexes.cc b/components/autofill/core/common/autofill_regexes.cc
index b141cb2..8053897a 100644
--- a/components/autofill/core/common/autofill_regexes.cc
+++ b/components/autofill/core/common/autofill_regexes.cc
@@ -8,8 +8,8 @@
#include <unordered_map>
#include <utility>
+#include "base/check.h"
#include "base/i18n/unicodestring.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/no_destructor.h"
#include "base/strings/string16.h"
diff --git a/components/autofill/core/common/save_password_progress_logger_unittest.cc b/components/autofill/core/common/save_password_progress_logger_unittest.cc
index 9e53069..bce8f456 100644
--- a/components/autofill/core/common/save_password_progress_logger_unittest.cc
+++ b/components/autofill/core/common/save_password_progress_logger_unittest.cc
@@ -9,7 +9,6 @@
#include <limits>
#include "base/bind.h"
-#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/common/password_form.h"
diff --git a/components/autofill_assistant/browser/devtools/error_reporter.cc b/components/autofill_assistant/browser/devtools/error_reporter.cc
index 296f9a4..544869a 100644
--- a/components/autofill_assistant/browser/devtools/error_reporter.cc
+++ b/components/autofill_assistant/browser/devtools/error_reporter.cc
@@ -10,7 +10,7 @@
#include <sstream>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/string_util.h"
namespace autofill_assistant {
diff --git a/components/autofill_assistant/browser/value_util.cc b/components/autofill_assistant/browser/value_util.cc
index d91aae0..554f91e 100644
--- a/components/autofill_assistant/browser/value_util.cc
+++ b/components/autofill_assistant/browser/value_util.cc
@@ -5,7 +5,7 @@
#include "components/autofill_assistant/browser/value_util.h"
#include <algorithm>
#include "base/i18n/case_conversion.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/utf_string_conversions.h"
namespace autofill_assistant {
diff --git a/components/base32/base32.cc b/components/base32/base32.cc
index 5c43a58..b4ad2ef 100644
--- a/components/base32/base32.cc
+++ b/components/base32/base32.cc
@@ -8,7 +8,7 @@
#include <limits>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/numerics/safe_math.h"
namespace base32 {
diff --git a/components/base32/base32_fuzzer.cc b/components/base32/base32_fuzzer.cc
index 76c3230..82b2b2a 100644
--- a/components/base32/base32_fuzzer.cc
+++ b/components/base32/base32_fuzzer.cc
@@ -7,7 +7,7 @@
#include <limits>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/stl_util.h"
#include "components/base32/base32.h"
#include "components/base32/base32_test_util.h"
diff --git a/components/base32/base32_test_util.cc b/components/base32/base32_test_util.cc
index 578d0e7..9c605be 100644
--- a/components/base32/base32_test_util.cc
+++ b/components/base32/base32_test_util.cc
@@ -8,7 +8,8 @@
#include <limits>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/numerics/safe_math.h"
#include "components/base32/base32.h"
diff --git a/components/bookmarks/browser/bookmark_client.cc b/components/bookmarks/browser/bookmark_client.cc
index c33d0ae..5f5510d 100644
--- a/components/bookmarks/browser/bookmark_client.cc
+++ b/components/bookmarks/browser/bookmark_client.cc
@@ -4,7 +4,7 @@
#include "components/bookmarks/browser/bookmark_client.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace bookmarks {
diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
index d9ec806..7e0dd34a 100644
--- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
@@ -12,11 +12,12 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check_op.h"
#include "base/guid.h"
#include "base/i18n/string_compare.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/strings/string_util.h"
#include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
#include "components/bookmarks/browser/bookmark_model_observer.h"
diff --git a/components/bookmarks/browser/bookmark_node_data_ios.cc b/components/bookmarks/browser/bookmark_node_data_ios.cc
index 3c646744..01feaa10 100644
--- a/components/bookmarks/browser/bookmark_node_data_ios.cc
+++ b/components/bookmarks/browser/bookmark_node_data_ios.cc
@@ -4,7 +4,7 @@
#include "components/bookmarks/browser/bookmark_node_data.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace bookmarks {
diff --git a/components/bookmarks/browser/bookmark_node_data_views.cc b/components/bookmarks/browser/bookmark_node_data_views.cc
index a6735f2..0137aeb 100644
--- a/components/bookmarks/browser/bookmark_node_data_views.cc
+++ b/components/bookmarks/browser/bookmark_node_data_views.cc
@@ -4,7 +4,7 @@
#include "components/bookmarks/browser/bookmark_node_data.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/no_destructor.h"
#include "base/pickle.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/bookmarks/browser/startup_task_runner_service.cc b/components/bookmarks/browser/startup_task_runner_service.cc
index 117bb1b..99d4d9a2 100644
--- a/components/bookmarks/browser/startup_task_runner_service.cc
+++ b/components/bookmarks/browser/startup_task_runner_service.cc
@@ -4,8 +4,8 @@
#include "components/bookmarks/browser/startup_task_runner_service.h"
+#include "base/check_op.h"
#include "base/deferred_sequenced_task_runner.h"
-#include "base/logging.h"
#include "base/sequenced_task_runner.h"
namespace bookmarks {
diff --git a/components/bookmarks/browser/titled_url_match.cc b/components/bookmarks/browser/titled_url_match.cc
index 6ebe5646..739841c6 100644
--- a/components/bookmarks/browser/titled_url_match.cc
+++ b/components/bookmarks/browser/titled_url_match.cc
@@ -4,7 +4,7 @@
#include "components/bookmarks/browser/titled_url_match.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/string16.h"
namespace bookmarks {
diff --git a/components/bookmarks/managed/managed_bookmark_service.cc b/components/bookmarks/managed/managed_bookmark_service.cc
index 23805a6b..3f0bfcaf5d 100644
--- a/components/bookmarks/managed/managed_bookmark_service.cc
+++ b/components/bookmarks/managed/managed_bookmark_service.cc
@@ -13,7 +13,7 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/macros.h"
#include "base/strings/string16.h"
#include "base/values.h"
diff --git a/components/bookmarks/managed/managed_bookmarks_tracker.cc b/components/bookmarks/managed/managed_bookmarks_tracker.cc
index cd2363f7..fd2e055 100644
--- a/components/bookmarks/managed/managed_bookmarks_tracker.cc
+++ b/components/bookmarks/managed/managed_bookmarks_tracker.cc
@@ -10,9 +10,10 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
+#include "base/check.h"
#include "base/guid.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
+#include "base/notreached.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "components/bookmarks/browser/bookmark_model.h"
diff --git a/components/bookmarks/test/bookmark_test_helpers.cc b/components/bookmarks/test/bookmark_test_helpers.cc
index 5dc47b2..228bf7e 100644
--- a/components/bookmarks/test/bookmark_test_helpers.cc
+++ b/components/bookmarks/test/bookmark_test_helpers.cc
@@ -7,7 +7,7 @@
#include <stddef.h>
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/bookmarks/test/test_bookmark_client.cc b/components/bookmarks/test/test_bookmark_client.cc
index 4e3b0a6..08ad1af 100644
--- a/components/bookmarks/test/test_bookmark_client.cc
+++ b/components/bookmarks/test/test_bookmark_client.cc
@@ -11,7 +11,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/bookmarks/browser/bookmark_node.h"
diff --git a/components/browser_watcher/activity_report_extractor.cc b/components/browser_watcher/activity_report_extractor.cc
index 540a3081..f8671a3 100644
--- a/components/browser_watcher/activity_report_extractor.cc
+++ b/components/browser_watcher/activity_report_extractor.cc
@@ -9,8 +9,9 @@
#include <utility>
#include <vector>
+#include "base/check_op.h"
#include "base/debug/activity_analyzer.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
diff --git a/components/browser_watcher/fetch_system_session_events_main_win.cc b/components/browser_watcher/fetch_system_session_events_main_win.cc
index 4a6d8b4..93ce8d7 100644
--- a/components/browser_watcher/fetch_system_session_events_main_win.cc
+++ b/components/browser_watcher/fetch_system_session_events_main_win.cc
@@ -6,7 +6,6 @@
#include <iostream>
-#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
#include "components/metrics/system_session_analyzer/system_session_analyzer_win.h"
diff --git a/components/browsing_data/content/cookie_helper.cc b/components/browsing_data/content/cookie_helper.cc
index 3de3bd2a..607e68c 100644
--- a/components/browsing_data/content/cookie_helper.cc
+++ b/components/browsing_data/content/cookie_helper.cc
@@ -9,8 +9,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/no_destructor.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/storage_partition.h"
diff --git a/components/browsing_data/content/mock_cache_storage_helper.cc b/components/browsing_data/content/mock_cache_storage_helper.cc
index ad152cf..61f8cb2 100644
--- a/components/browsing_data/content/mock_cache_storage_helper.cc
+++ b/components/browsing_data/content/mock_cache_storage_helper.cc
@@ -5,7 +5,6 @@
#include "components/browsing_data/content/mock_cache_storage_helper.h"
#include "base/callback.h"
-#include "base/logging.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/storage_partition.h"
#include "content/public/browser/storage_usage_info.h"
diff --git a/components/browsing_data/content/mock_cookie_helper.cc b/components/browsing_data/content/mock_cookie_helper.cc
index 83a87eb..1fd8545 100644
--- a/components/browsing_data/content/mock_cookie_helper.cc
+++ b/components/browsing_data/content/mock_cookie_helper.cc
@@ -6,7 +6,6 @@
#include <memory>
-#include "base/logging.h"
#include "base/optional.h"
#include "base/stl_util.h"
#include "base/time/time.h"
diff --git a/components/browsing_data/content/mock_file_system_helper.cc b/components/browsing_data/content/mock_file_system_helper.cc
index fa373ba9..74b5ac3 100644
--- a/components/browsing_data/content/mock_file_system_helper.cc
+++ b/components/browsing_data/content/mock_file_system_helper.cc
@@ -5,7 +5,6 @@
#include "components/browsing_data/content/mock_file_system_helper.h"
#include "base/callback.h"
-#include "base/logging.h"
#include "base/stl_util.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/storage_partition.h"
diff --git a/components/browsing_data/content/mock_indexed_db_helper.cc b/components/browsing_data/content/mock_indexed_db_helper.cc
index 8f02b2f..53c82cd 100644
--- a/components/browsing_data/content/mock_indexed_db_helper.cc
+++ b/components/browsing_data/content/mock_indexed_db_helper.cc
@@ -5,7 +5,6 @@
#include "components/browsing_data/content/mock_indexed_db_helper.h"
#include "base/callback.h"
-#include "base/logging.h"
#include "base/stl_util.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/storage_partition.h"
diff --git a/components/browsing_data/content/mock_local_storage_helper.cc b/components/browsing_data/content/mock_local_storage_helper.cc
index 8a37cd6..e0ea7f2 100644
--- a/components/browsing_data/content/mock_local_storage_helper.cc
+++ b/components/browsing_data/content/mock_local_storage_helper.cc
@@ -7,7 +7,6 @@
#include <utility>
#include "base/callback.h"
-#include "base/logging.h"
#include "base/stl_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
diff --git a/components/browsing_data/content/mock_service_worker_helper.cc b/components/browsing_data/content/mock_service_worker_helper.cc
index 74c6746..9b4104d3 100644
--- a/components/browsing_data/content/mock_service_worker_helper.cc
+++ b/components/browsing_data/content/mock_service_worker_helper.cc
@@ -7,7 +7,6 @@
#include <vector>
#include "base/callback.h"
-#include "base/logging.h"
#include "base/stl_util.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/storage_partition.h"
diff --git a/components/browsing_data/content/mock_shared_worker_helper.cc b/components/browsing_data/content/mock_shared_worker_helper.cc
index 99d41e8..1ba2ec4f 100644
--- a/components/browsing_data/content/mock_shared_worker_helper.cc
+++ b/components/browsing_data/content/mock_shared_worker_helper.cc
@@ -5,7 +5,6 @@
#include "components/browsing_data/content/mock_shared_worker_helper.h"
#include "base/callback.h"
-#include "base/logging.h"
#include "base/stl_util.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/storage_partition.h"
diff --git a/components/captive_portal/content/captive_portal_service.cc b/components/captive_portal/content/captive_portal_service.cc
index 8790e40..9a64624 100644
--- a/components/captive_portal/content/captive_portal_service.cc
+++ b/components/captive_portal/content/captive_portal_service.cc
@@ -6,8 +6,9 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/time/tick_clock.h"
#include "build/build_config.h"
#include "components/captive_portal/core/captive_portal_metrics.h"
diff --git a/components/captive_portal/core/captive_portal_testing_utils.cc b/components/captive_portal/core/captive_portal_testing_utils.cc
index fce55ff..41ea717b 100644
--- a/components/captive_portal/core/captive_portal_testing_utils.cc
+++ b/components/captive_portal/core/captive_portal_testing_utils.cc
@@ -4,7 +4,6 @@
#include "components/captive_portal/core/captive_portal_testing_utils.h"
-#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/strings/string_piece.h"
#include "net/base/net_errors.h"
diff --git a/components/captive_portal/core/captive_portal_types.cc b/components/captive_portal/core/captive_portal_types.cc
index 806a2d0db..55d9162 100644
--- a/components/captive_portal/core/captive_portal_types.cc
+++ b/components/captive_portal/core/captive_portal_types.cc
@@ -4,7 +4,7 @@
#include "components/captive_portal/core/captive_portal_types.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/stl_util.h"
namespace captive_portal {
diff --git a/components/cast_channel/cast_channel_enum.cc b/components/cast_channel/cast_channel_enum.cc
index 0acfe02..e499d0e9 100644
--- a/components/cast_channel/cast_channel_enum.cc
+++ b/components/cast_channel/cast_channel_enum.cc
@@ -4,7 +4,9 @@
#include "components/cast_channel/cast_channel_enum.h"
-#include "base/logging.h"
+#include <ostream>
+
+#include "base/notreached.h"
namespace cast_channel {
diff --git a/components/cbor/diagnostic_writer.cc b/components/cbor/diagnostic_writer.cc
index 04983e1..074f4b89 100644
--- a/components/cbor/diagnostic_writer.cc
+++ b/components/cbor/diagnostic_writer.cc
@@ -7,7 +7,7 @@
#include <string>
#include "base/json/string_escape.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/numerics/clamped_math.h"
#include "base/strings/string_number_conversions.h"
#include "components/cbor/constants.h"
diff --git a/components/cbor/reader.cc b/components/cbor/reader.cc
index 589d6e6..9c748d4 100644
--- a/components/cbor/reader.cc
+++ b/components/cbor/reader.cc
@@ -8,7 +8,8 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/numerics/checked_math.h"
#include "base/numerics/safe_conversions.h"
#include "base/stl_util.h"
diff --git a/components/cbor/values.cc b/components/cbor/values.cc
index 09fc4de..7329b58 100644
--- a/components/cbor/values.cc
+++ b/components/cbor/values.cc
@@ -7,7 +7,8 @@
#include <new>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_util.h"
#include "components/cbor/constants.h"
diff --git a/components/cbor/writer.cc b/components/cbor/writer.cc
index 75a8e4b..24650c7 100644
--- a/components/cbor/writer.cc
+++ b/components/cbor/writer.cc
@@ -6,7 +6,8 @@
#include <string>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_piece.h"
#include "components/cbor/constants.h"
diff --git a/components/cdm/renderer/external_clear_key_key_system_properties.cc b/components/cdm/renderer/external_clear_key_key_system_properties.cc
index 0998dd5..a8513bf 100644
--- a/components/cdm/renderer/external_clear_key_key_system_properties.cc
+++ b/components/cdm/renderer/external_clear_key_key_system_properties.cc
@@ -4,7 +4,7 @@
#include "components/cdm/renderer/external_clear_key_key_system_properties.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "media/base/eme_constants.h"
namespace cdm {
diff --git a/components/certificate_transparency/ct_known_logs.cc b/components/certificate_transparency/ct_known_logs.cc
index 1bc2257..d5935ff9 100644
--- a/components/certificate_transparency/ct_known_logs.cc
+++ b/components/certificate_transparency/ct_known_logs.cc
@@ -10,7 +10,6 @@
#include <algorithm>
#include <iterator>
-#include "base/logging.h"
#include "base/macros.h"
#include "base/stl_util.h"
#include "base/time/time.h"
diff --git a/components/chromeos_camera/common/jpeg_encode_accelerator_mojom_traits.cc b/components/chromeos_camera/common/jpeg_encode_accelerator_mojom_traits.cc
index 1278acb..25d4774 100644
--- a/components/chromeos_camera/common/jpeg_encode_accelerator_mojom_traits.cc
+++ b/components/chromeos_camera/common/jpeg_encode_accelerator_mojom_traits.cc
@@ -4,7 +4,7 @@
#include "components/chromeos_camera/common/jpeg_encode_accelerator_mojom_traits.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace mojo {
diff --git a/components/chromeos_camera/common/mjpeg_decode_accelerator_mojom_traits.cc b/components/chromeos_camera/common/mjpeg_decode_accelerator_mojom_traits.cc
index befc8ced..fab2b68f 100644
--- a/components/chromeos_camera/common/mjpeg_decode_accelerator_mojom_traits.cc
+++ b/components/chromeos_camera/common/mjpeg_decode_accelerator_mojom_traits.cc
@@ -4,7 +4,8 @@
#include "components/chromeos_camera/common/mjpeg_decode_accelerator_mojom_traits.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "media/base/ipc/media_param_traits_macros.h"
#include "mojo/public/cpp/base/time_mojom_traits.h"
#include "mojo/public/cpp/system/platform_handle.h"
diff --git a/components/cloud_devices/common/cloud_device_description.cc b/components/cloud_devices/common/cloud_device_description.cc
index 4cdf39d..dfa77ca 100644
--- a/components/cloud_devices/common/cloud_device_description.cc
+++ b/components/cloud_devices/common/cloud_device_description.cc
@@ -8,7 +8,6 @@
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
-#include "base/logging.h"
#include "base/values.h"
#include "components/cloud_devices/common/cloud_device_description_consts.h"
diff --git a/components/cloud_devices/common/printer_description.cc b/components/cloud_devices/common/printer_description.cc
index 7839484a..13d261a 100644
--- a/components/cloud_devices/common/printer_description.cc
+++ b/components/cloud_devices/common/printer_description.cc
@@ -11,9 +11,10 @@
#include <utility>
#include <vector>
+#include "base/check.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.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/components/content_settings/core/browser/content_settings_origin_identifier_value_map.cc b/components/content_settings/core/browser/content_settings_origin_identifier_value_map.cc
index 63604f4..5a9d52de7 100644
--- a/components/content_settings/core/browser/content_settings_origin_identifier_value_map.cc
+++ b/components/content_settings/core/browser/content_settings_origin_identifier_value_map.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <tuple>
+#include "base/check_op.h"
#include "base/compiler_specific.h"
-#include "base/logging.h"
#include "base/synchronization/lock.h"
#include "base/values.h"
#include "components/content_settings/core/browser/content_settings_rule.h"
diff --git a/components/content_settings/core/browser/content_settings_registry_unittest.cc b/components/content_settings/core/browser/content_settings_registry_unittest.cc
index eb2d321..6a5c422 100644
--- a/components/content_settings/core/browser/content_settings_registry_unittest.cc
+++ b/components/content_settings/core/browser/content_settings_registry_unittest.cc
@@ -5,7 +5,6 @@
#include <string>
#include <vector>
-#include "base/logging.h"
#include "base/values.h"
#include "build/build_config.h"
#include "components/content_settings/core/browser/content_settings_info.h"
diff --git a/components/content_settings/core/browser/content_settings_rule.cc b/components/content_settings/core/browser/content_settings_rule.cc
index 2e845ed4..dc4b0af 100644
--- a/components/content_settings/core/browser/content_settings_rule.cc
+++ b/components/content_settings/core/browser/content_settings_rule.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
namespace content_settings {
diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
index d585f9cb..b0a59b7e 100644
--- a/components/content_settings/core/browser/content_settings_utils.cc
+++ b/components/content_settings/core/browser/content_settings_utils.cc
@@ -8,7 +8,7 @@
#include <vector>
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string_split.h"
#include "base/values.h"
diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
index 842bd6e..fbf60d4f 100644
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -5,8 +5,8 @@
#include "components/content_settings/core/browser/cookie_settings.h"
#include "base/bind.h"
+#include "base/check.h"
#include "base/feature_list.h"
-#include "base/logging.h"
#include "components/content_settings/core/browser/content_settings_utils.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/content_settings.h"
diff --git a/components/content_settings/core/browser/uma_util.cc b/components/content_settings/core/browser/uma_util.cc
index 28a6040..66d13f7 100644
--- a/components/content_settings/core/browser/uma_util.cc
+++ b/components/content_settings/core/browser/uma_util.cc
@@ -6,8 +6,9 @@
#include <stddef.h>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
namespace content_settings {
diff --git a/components/content_settings/core/browser/website_settings_info.cc b/components/content_settings/core/browser/website_settings_info.cc
index 6f1e7c8f..56c4570 100644
--- a/components/content_settings/core/browser/website_settings_info.cc
+++ b/components/content_settings/core/browser/website_settings_info.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/string_util.h"
#include "base/values.h"
#include "components/pref_registry/pref_registry_syncable.h"
diff --git a/components/content_settings/core/browser/website_settings_registry.cc b/components/content_settings/core/browser/website_settings_registry.cc
index 1198a17..dbaaa3d 100644
--- a/components/content_settings/core/browser/website_settings_registry.cc
+++ b/components/content_settings/core/browser/website_settings_registry.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#include "components/content_settings/core/common/content_settings.h"
diff --git a/components/content_settings/core/browser/website_settings_registry_unittest.cc b/components/content_settings/core/browser/website_settings_registry_unittest.cc
index 7ab0b3c..040fb60 100644
--- a/components/content_settings/core/browser/website_settings_registry_unittest.cc
+++ b/components/content_settings/core/browser/website_settings_registry_unittest.cc
@@ -6,7 +6,6 @@
#include <memory>
-#include "base/logging.h"
#include "base/values.h"
#include "components/content_settings/core/browser/website_settings_info.h"
#include "components/content_settings/core/common/content_settings.h"
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
index aa09812d..0478f6a3 100644
--- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc
@@ -8,7 +8,8 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "build/build_config.h"
#include "components/content_settings/core/common/content_settings_utils.h"
diff --git a/components/content_settings/core/common/content_settings_pattern.cc b/components/content_settings/core/common/content_settings_pattern.cc
index 5cb7459..b8eacf8 100644
--- a/components/content_settings/core/common/content_settings_pattern.cc
+++ b/components/content_settings/core/common/content_settings_pattern.cc
@@ -11,7 +11,8 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/optional.h"
#include "base/stl_util.h"
#include "base/strings/string_piece.h"
diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/components/content_settings/core/common/cookie_settings_base.cc
index 3046166c..c670a897 100644
--- a/components/content_settings/core/common/cookie_settings_base.cc
+++ b/components/content_settings/core/common/cookie_settings_base.cc
@@ -4,10 +4,11 @@
#include "components/content_settings/core/common/cookie_settings_base.h"
+#include "base/check.h"
#include "base/debug/stack_trace.h"
#include "base/debug/task_trace.h"
#include "base/feature_list.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "build/build_config.h"
#include "components/content_settings/core/common/features.h"
#include "net/base/net_errors.h"
diff --git a/components/content_settings/core/common/cookie_settings_base_unittest.cc b/components/content_settings/core/common/cookie_settings_base_unittest.cc
index 0ee9a6e..71c06e1 100644
--- a/components/content_settings/core/common/cookie_settings_base_unittest.cc
+++ b/components/content_settings/core/common/cookie_settings_base_unittest.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "net/cookies/cookie_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
diff --git a/components/contextual_search/core/browser/ctr_aggregator_unittest.cc b/components/contextual_search/core/browser/ctr_aggregator_unittest.cc
index fd3b5b2..d3b5ecb 100644
--- a/components/contextual_search/core/browser/ctr_aggregator_unittest.cc
+++ b/components/contextual_search/core/browser/ctr_aggregator_unittest.cc
@@ -7,7 +7,6 @@
#include <unordered_map>
#include "base/gtest_prod_util.h"
-#include "base/logging.h"
#include "base/values.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/contextual_search/core/browser/weekly_activity_storage.cc b/components/contextual_search/core/browser/weekly_activity_storage.cc
index 3fa821d35..6ca42d2a 100644
--- a/components/contextual_search/core/browser/weekly_activity_storage.cc
+++ b/components/contextual_search/core/browser/weekly_activity_storage.cc
@@ -6,7 +6,7 @@
#include <algorithm> // std::min
-#include "base/logging.h"
+#include "base/check.h"
namespace {
diff --git a/components/crash/content/browser/child_exit_observer_android.cc b/components/crash/content/browser/child_exit_observer_android.cc
index b3b71d6..20d699b 100644
--- a/components/crash/content/browser/child_exit_observer_android.cc
+++ b/components/crash/content/browser/child_exit_observer_android.cc
@@ -7,7 +7,7 @@
#include <unistd.h>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/no_destructor.h"
#include "base/stl_util.h"
#include "components/crash/content/browser/crash_memory_metrics_collector_android.h"
diff --git a/components/crash/content/browser/crash_metrics_reporter_android.cc b/components/crash/content/browser/crash_metrics_reporter_android.cc
index 38af0400..99b71091 100644
--- a/components/crash/content/browser/crash_metrics_reporter_android.cc
+++ b/components/crash/content/browser/crash_metrics_reporter_android.cc
@@ -4,7 +4,7 @@
#include "components/crash/content/browser/crash_metrics_reporter_android.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/user_metrics.h"
#include "base/optional.h"
diff --git a/components/crash/core/app/crash_reporter_client.cc b/components/crash/core/app/crash_reporter_client.cc
index e778f68..1e413851 100644
--- a/components/crash/core/app/crash_reporter_client.cc
+++ b/components/crash/core/app/crash_reporter_client.cc
@@ -9,8 +9,8 @@
// On Windows don't use FilePath and logging.h.
// http://crbug.com/604923
#if !defined(OS_WIN)
+#include "base/check.h"
#include "base/files/file_path.h"
-#include "base/logging.h"
#else
#include <assert.h>
#define DCHECK assert
diff --git a/components/crash/core/app/fallback_crash_handler_launcher_win.cc b/components/crash/core/app/fallback_crash_handler_launcher_win.cc
index b5707d8..e9ce95a 100644
--- a/components/crash/core/app/fallback_crash_handler_launcher_win.cc
+++ b/components/crash/core/app/fallback_crash_handler_launcher_win.cc
@@ -4,7 +4,8 @@
#include "components/crash/core/app/fallback_crash_handler_launcher_win.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/win/win_util.h"
diff --git a/components/crash/core/app/fallback_crash_handler_win_unittest.cc b/components/crash/core/app/fallback_crash_handler_win_unittest.cc
index 60a25b53..769cb4d 100644
--- a/components/crash/core/app/fallback_crash_handler_win_unittest.cc
+++ b/components/crash/core/app/fallback_crash_handler_win_unittest.cc
@@ -10,10 +10,10 @@
#include <vector>
#include "base/base_switches.h"
+#include "base/check_op.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/process/process_handle.h"
#include "base/strings/string_number_conversions.h"
diff --git a/components/crash/core/app/fallback_crash_handling_win.cc b/components/crash/core/app/fallback_crash_handling_win.cc
index a77a57c..4857b98 100644
--- a/components/crash/core/app/fallback_crash_handling_win.cc
+++ b/components/crash/core/app/fallback_crash_handling_win.cc
@@ -7,8 +7,9 @@
#include <memory>
#include "base/base_switches.h"
+#include "base/check.h"
#include "base/command_line.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/fallback_crash_handler_launcher_win.h"
#include "components/crash/core/app/fallback_crash_handler_win.h"
diff --git a/components/crash/core/app/fallback_crash_handling_win_unittest.cc b/components/crash/core/app/fallback_crash_handling_win_unittest.cc
index ddbc20e2a..0af5578 100644
--- a/components/crash/core/app/fallback_crash_handling_win_unittest.cc
+++ b/components/crash/core/app/fallback_crash_handling_win_unittest.cc
@@ -5,10 +5,10 @@
#include "components/crash/core/app/fallback_crash_handling_win.h"
#include "base/base_switches.h"
+#include "base/check.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/logging.h"
#include "base/test/multiprocess_test.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/multiprocess_func_list.h"
diff --git a/components/crash/core/browser/crashes_ui_util.cc b/components/crash/core/browser/crashes_ui_util.cc
index 645fb84..46069259 100644
--- a/components/crash/core/browser/crashes_ui_util.cc
+++ b/components/crash/core/browser/crashes_ui_util.cc
@@ -9,7 +9,7 @@
#include <vector>
#include "base/i18n/time_formatting.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/values.h"
#include "components/strings/grit/components_chromium_strings.h"
diff --git a/components/cronet/android/cronet_library_loader.cc b/components/cronet/android/cronet_library_loader.cc
index db4e617..cec2b77 100644
--- a/components/cronet/android/cronet_library_loader.cc
+++ b/components/cronet/android/cronet_library_loader.cc
@@ -15,8 +15,8 @@
#include "base/android/jni_string.h"
#include "base/android/jni_utils.h"
#include "base/android/library_loader/library_loader_hooks.h"
+#include "base/check_op.h"
#include "base/feature_list.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/message_loop/message_loop_current.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/components/cronet/android/cronet_upload_data_stream_adapter.cc b/components/cronet/android/cronet_upload_data_stream_adapter.cc
index 51c03c4..957e6d7b 100644
--- a/components/cronet/android/cronet_upload_data_stream_adapter.cc
+++ b/components/cronet/android/cronet_upload_data_stream_adapter.cc
@@ -11,7 +11,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "components/cronet/android/cronet_jni_headers/CronetUploadDataStream_jni.h"
diff --git a/components/cronet/android/io_buffer_with_byte_buffer.cc b/components/cronet/android/io_buffer_with_byte_buffer.cc
index 81fdf93..1d484ae2 100644
--- a/components/cronet/android/io_buffer_with_byte_buffer.cc
+++ b/components/cronet/android/io_buffer_with_byte_buffer.cc
@@ -4,7 +4,7 @@
#include "components/cronet/android/io_buffer_with_byte_buffer.h"
-#include "base/logging.h"
+#include "base/check_op.h"
namespace cronet {
diff --git a/components/cronet/android/test/cronet_url_request_context_config_test.cc b/components/cronet/android/test/cronet_url_request_context_config_test.cc
index 0c387d01..9725c46 100644
--- a/components/cronet/android/test/cronet_url_request_context_config_test.cc
+++ b/components/cronet/android/test/cronet_url_request_context_config_test.cc
@@ -9,7 +9,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/cronet/android/cronet_tests_jni_headers/CronetUrlRequestContextTest_jni.h"
#include "components/cronet/url_request_context_config.h"
#include "components/cronet/version.h"
diff --git a/components/cronet/android/test/url_request_intercepting_job_factory.cc b/components/cronet/android/test/url_request_intercepting_job_factory.cc
index 1ae8bb9..4cd51eee 100644
--- a/components/cronet/android/test/url_request_intercepting_job_factory.cc
+++ b/components/cronet/android/test/url_request_intercepting_job_factory.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/url_request/url_request_interceptor.h"
namespace cronet {
diff --git a/components/cronet/metrics_util.cc b/components/cronet/metrics_util.cc
index 1a0d731..34829735 100644
--- a/components/cronet/metrics_util.cc
+++ b/components/cronet/metrics_util.cc
@@ -4,7 +4,7 @@
#include "components/cronet/metrics_util.h"
-#include "base/logging.h"
+#include "base/check.h"
namespace cronet {
diff --git a/components/cronet/native/buffer.cc b/components/cronet/native/buffer.cc
index 2a936d0..3f26486 100644
--- a/components/cronet/native/buffer.cc
+++ b/components/cronet/native/buffer.cc
@@ -4,7 +4,6 @@
#include "components/cronet/native/generated/cronet.idl_impl_interface.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/no_destructor.h"
#include "base/numerics/safe_conversions.h"
diff --git a/components/cronet/native/generated/cronet.idl_impl_interface.cc b/components/cronet/native/generated/cronet.idl_impl_interface.cc
index e7229f0b..f94e7e4 100644
--- a/components/cronet/native/generated/cronet.idl_impl_interface.cc
+++ b/components/cronet/native/generated/cronet.idl_impl_interface.cc
@@ -6,7 +6,7 @@
#include "components/cronet/native/generated/cronet.idl_impl_interface.h"
-#include "base/logging.h"
+#include "base/check.h"
// C functions of Cronet_Buffer that forward calls to C++ implementation.
void Cronet_Buffer_Destroy(Cronet_BufferPtr self) {
diff --git a/components/cronet/native/generated/cronet.idl_impl_interface_unittest.cc b/components/cronet/native/generated/cronet.idl_impl_interface_unittest.cc
index 9f92f38c..3c92bfa 100644
--- a/components/cronet/native/generated/cronet.idl_impl_interface_unittest.cc
+++ b/components/cronet/native/generated/cronet.idl_impl_interface_unittest.cc
@@ -6,7 +6,7 @@
#include "components/cronet/native/generated/cronet.idl_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/native/generated/cronet.idl_impl_struct.cc b/components/cronet/native/generated/cronet.idl_impl_struct.cc
index 735b65a60..7288afc 100644
--- a/components/cronet/native/generated/cronet.idl_impl_struct.cc
+++ b/components/cronet/native/generated/cronet.idl_impl_struct.cc
@@ -8,7 +8,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
// Struct Cronet_Error.
Cronet_Error::Cronet_Error() = default;
diff --git a/components/cronet/native/generated/cronet.idl_impl_struct_unittest.cc b/components/cronet/native/generated/cronet.idl_impl_struct_unittest.cc
index 7b73c91..3091405 100644
--- a/components/cronet/native/generated/cronet.idl_impl_struct_unittest.cc
+++ b/components/cronet/native/generated/cronet.idl_impl_struct_unittest.cc
@@ -8,7 +8,6 @@
#include <math.h>
-#include "base/logging.h"
#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/cronet/native/perftest/main.cc b/components/cronet/native/perftest/main.cc
index f1f2e71..092163a 100644
--- a/components/cronet/native/perftest/main.cc
+++ b/components/cronet/native/perftest/main.cc
@@ -4,11 +4,13 @@
#include "components/cronet/native/perftest/perf_test.h"
-#include "base/logging.h"
+#include <ostream>
+
+#include "base/check_op.h"
// When invoked, passes first and only argument to native performance test.
int main(int argc, char* argv[]) {
CHECK_EQ(argc, 2) << "Must include experimental options in JSON as only arg.";
PerfTest(argv[1]);
return 0;
-}
\ No newline at end of file
+}
diff --git a/components/cronet/native/perftest/perf_test.cc b/components/cronet/native/perftest/perf_test.cc
index e15aa69b..cd5a7a97 100644
--- a/components/cronet/native/perftest/perf_test.cc
+++ b/components/cronet/native/perftest/perf_test.cc
@@ -6,9 +6,9 @@
#include "base/at_exit.h"
#include "base/atomic_sequence_num.h"
+#include "base/check_op.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
-#include "base/logging.h"
#include "base/memory/scoped_refptr.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
diff --git a/components/cronet/native/runnables_unittest.cc b/components/cronet/native/runnables_unittest.cc
index 49df32d..6455e12 100644
--- a/components/cronet/native/runnables_unittest.cc
+++ b/components/cronet/native/runnables_unittest.cc
@@ -7,7 +7,7 @@
#include <string>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/components/cronet/native/test/buffer_test.cc b/components/cronet/native/test/buffer_test.cc
index c0577a3..d74be94 100644
--- a/components/cronet/native/test/buffer_test.cc
+++ b/components/cronet/native/test/buffer_test.cc
@@ -6,7 +6,7 @@
#include <limits>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/components/cronet/native/test/engine_test.cc b/components/cronet/native/test/engine_test.cc
index 70e1fb4..24197fb 100644
--- a/components/cronet/native/test/engine_test.cc
+++ b/components/cronet/native/test/engine_test.cc
@@ -4,9 +4,9 @@
#include "cronet_c.h"
+#include "base/check.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "components/cronet/native/test/test_util.h"
diff --git a/components/cronet/native/test/executors_test.cc b/components/cronet/native/test/executors_test.cc
index 042ac512..0aa882e 100644
--- a/components/cronet/native/test/executors_test.cc
+++ b/components/cronet/native/test/executors_test.cc
@@ -4,7 +4,7 @@
#include "cronet_c.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/components/cronet/native/test/test_request_finished_info_listener.cc b/components/cronet/native/test/test_request_finished_info_listener.cc
index f75d094a..d1e79f6 100644
--- a/components/cronet/native/test/test_request_finished_info_listener.cc
+++ b/components/cronet/native/test/test_request_finished_info_listener.cc
@@ -4,7 +4,7 @@
#include "components/cronet/native/test/test_request_finished_info_listener.h"
-#include "base/logging.h"
+#include "base/check.h"
namespace cronet {
namespace test {
diff --git a/components/cronet/native/test/test_stream_engine.cc b/components/cronet/native/test/test_stream_engine.cc
index 28abfe7..f694d4d6 100644
--- a/components/cronet/native/test/test_stream_engine.cc
+++ b/components/cronet/native/test/test_stream_engine.cc
@@ -4,7 +4,7 @@
#include "cronet_c.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/cronet/native/test/test_util.h"
#include "components/grpc_support/test/get_stream_engine.h"
diff --git a/components/cronet/native/upload_data_sink.cc b/components/cronet/native/upload_data_sink.cc
index b2120370..8399b87 100644
--- a/components/cronet/native/upload_data_sink.cc
+++ b/components/cronet/native/upload_data_sink.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
#include "base/strings/strcat.h"
#include "base/strings/stringprintf.h"
diff --git a/components/cronet/stale_host_resolver.cc b/components/cronet/stale_host_resolver.cc
index 58fb0c8..f5defe95 100644
--- a/components/cronet/stale_host_resolver.cc
+++ b/components/cronet/stale_host_resolver.cc
@@ -10,8 +10,9 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/timer/timer.h"
#include "base/values.h"
diff --git a/components/cronet/stale_host_resolver_unittest.cc b/components/cronet/stale_host_resolver_unittest.cc
index 60828f0..437387f 100644
--- a/components/cronet/stale_host_resolver_unittest.cc
+++ b/components/cronet/stale_host_resolver_unittest.cc
@@ -9,7 +9,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/ref_counted.h"
#include "base/optional.h"
#include "base/run_loop.h"
diff --git a/components/cronet/url_request_context_config_unittest.cc b/components/cronet/url_request_context_config_unittest.cc
index f775f4e..6a6f507 100644
--- a/components/cronet/url_request_context_config_unittest.cc
+++ b/components/cronet/url_request_context_config_unittest.cc
@@ -7,8 +7,9 @@
#include <memory>
#include "base/bind.h"
+#include "base/check.h"
#include "base/json/json_writer.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/strcat.h"
#include "base/strings/string_piece.h"
#include "base/test/task_environment.h"
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc
index 40761fb..e3a2e3e9 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc
@@ -10,10 +10,10 @@
#include <vector>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/command_line.h"
#include "base/feature_list.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/sparse_histogram.h"
#include "base/strings/string_number_conversions.h"
diff --git a/components/data_reduction_proxy/core/browser/db_data_owner.cc b/components/data_reduction_proxy/core/browser/db_data_owner.cc
index c48e546..49e42fb 100644
--- a/components/data_reduction_proxy/core/browser/db_data_owner.cc
+++ b/components/data_reduction_proxy/core/browser/db_data_owner.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "components/data_reduction_proxy/core/browser/data_store.h"
#include "components/data_reduction_proxy/core/browser/data_usage_store.h"
#include "components/data_reduction_proxy/proto/data_store.pb.h"
diff --git a/components/data_reduction_proxy/core/common/uma_util.cc b/components/data_reduction_proxy/core/common/uma_util.cc
index 2f223ca..a86da44 100644
--- a/components/data_reduction_proxy/core/common/uma_util.cc
+++ b/components/data_reduction_proxy/core/common/uma_util.cc
@@ -4,8 +4,8 @@
#include "components/data_reduction_proxy/core/common/uma_util.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
namespace data_reduction_proxy {
diff --git a/components/dom_distiller/core/article_distillation_update.cc b/components/dom_distiller/core/article_distillation_update.cc
index dab88db..0bb29d7 100644
--- a/components/dom_distiller/core/article_distillation_update.cc
+++ b/components/dom_distiller/core/article_distillation_update.cc
@@ -4,7 +4,7 @@
#include "components/dom_distiller/core/article_distillation_update.h"
-#include "base/logging.h"
+#include "base/check_op.h"
namespace dom_distiller {
diff --git a/components/dom_distiller/core/article_entry.cc b/components/dom_distiller/core/article_entry.cc
index 1c3eb4c1..a74d1e3a 100644
--- a/components/dom_distiller/core/article_entry.cc
+++ b/components/dom_distiller/core/article_entry.cc
@@ -4,7 +4,6 @@
#include "components/dom_distiller/core/article_entry.h"
-#include "base/logging.h"
namespace dom_distiller {
diff --git a/components/dom_distiller/core/distillable_page_detector.cc b/components/dom_distiller/core/distillable_page_detector.cc
index baef8eb7..e3df402 100644
--- a/components/dom_distiller/core/distillable_page_detector.cc
+++ b/components/dom_distiller/core/distillable_page_detector.cc
@@ -7,7 +7,7 @@
#include <stddef.h>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "components/grit/components_resources.h"
#include "ui/base/resource/resource_bundle.h"
diff --git a/components/domain_reliability/monitor.cc b/components/domain_reliability/monitor.cc
index e896cf6..0f4aa9fa 100644
--- a/components/domain_reliability/monitor.cc
+++ b/components/domain_reliability/monitor.cc
@@ -8,8 +8,9 @@
#include <utility>
#include "base/bind.h"
+#include "base/check.h"
#include "base/command_line.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "base/task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/components/domain_reliability/util.cc b/components/domain_reliability/util.cc
index 94bb7c1..196c10f 100644
--- a/components/domain_reliability/util.cc
+++ b/components/domain_reliability/util.cc
@@ -7,8 +7,8 @@
#include <stddef.h>
#include "base/callback.h"
-#include "base/logging.h"
#include "base/memory/weak_ptr.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
diff --git a/components/download/database/download_db_conversions.cc b/components/download/database/download_db_conversions.cc
index 4691f09..fc79a148 100644
--- a/components/download/database/download_db_conversions.cc
+++ b/components/download/database/download_db_conversions.cc
@@ -5,7 +5,7 @@
#include "components/download/database/download_db_conversions.h"
#include <utility>
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/pickle.h"
namespace download {
diff --git a/components/download/internal/background_service/startup_status.cc b/components/download/internal/background_service/startup_status.cc
index 5218e75..57becf9 100644
--- a/components/download/internal/background_service/startup_status.cc
+++ b/components/download/internal/background_service/startup_status.cc
@@ -4,7 +4,7 @@
#include "components/download/internal/background_service/startup_status.h"
-#include "base/logging.h"
+#include "base/check.h"
namespace download {
diff --git a/components/download/internal/common/base_file_unittest.cc b/components/download/internal/common/base_file_unittest.cc
index 0b32a96a..9ced7de 100644
--- a/components/download/internal/common/base_file_unittest.cc
+++ b/components/download/internal/common/base_file_unittest.cc
@@ -11,7 +11,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/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/test/test_file_util.h"
diff --git a/components/download/internal/common/download_interrupt_reasons_utils.cc b/components/download/internal/common/download_interrupt_reasons_utils.cc
index f77d05e6..a2fd4dac 100644
--- a/components/download/internal/common/download_interrupt_reasons_utils.cc
+++ b/components/download/internal/common/download_interrupt_reasons_utils.cc
@@ -4,7 +4,7 @@
#include "components/download/public/common/download_interrupt_reasons_utils.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace download {
diff --git a/components/download/internal/common/download_item_impl_delegate.cc b/components/download/internal/common/download_item_impl_delegate.cc
index 51ec22d..6a0f0ee 100644
--- a/components/download/internal/common/download_item_impl_delegate.cc
+++ b/components/download/internal/common/download_item_impl_delegate.cc
@@ -5,7 +5,7 @@
#include "components/download/public/common/download_item_impl_delegate.h"
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "build/build_config.h"
#include "components/download/public/common/auto_resumption_handler.h"
#include "components/download/public/common/download_danger_type.h"
diff --git a/components/download/internal/common/rate_estimator.cc b/components/download/internal/common/rate_estimator.cc
index 73e30ed5..0138acd 100644
--- a/components/download/internal/common/rate_estimator.cc
+++ b/components/download/internal/common/rate_estimator.cc
@@ -4,7 +4,7 @@
#include "components/download/public/common/rate_estimator.h"
-#include "base/logging.h"
+#include "base/check.h"
using base::TimeDelta;
using base::TimeTicks;
diff --git a/components/drive/file_errors.cc b/components/drive/file_errors.cc
index 2c49448a..3c6816a 100644
--- a/components/drive/file_errors.cc
+++ b/components/drive/file_errors.cc
@@ -4,7 +4,7 @@
#include "components/drive/file_errors.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace drive {
diff --git a/components/drive/service/fake_drive_service.cc b/components/drive/service/fake_drive_service.cc
index a4f14bc0..f1bfd27 100644
--- a/components/drive/service/fake_drive_service.cc
+++ b/components/drive/service/fake_drive_service.cc
@@ -12,11 +12,12 @@
#include <vector>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/files/file_util.h"
#include "base/hash/md5.h"
#include "base/json/json_string_value_serializer.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_tokenizer.h"
diff --git a/components/embedder_support/android/metrics/memory_metrics_logger.cc b/components/embedder_support/android/metrics/memory_metrics_logger.cc
index 5fde156..a923508 100644
--- a/components/embedder_support/android/metrics/memory_metrics_logger.cc
+++ b/components/embedder_support/android/metrics/memory_metrics_logger.cc
@@ -7,7 +7,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/compiler_specific.h"
-#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/metrics/histogram_functions.h"
#include "base/sequenced_task_runner.h"
diff --git a/components/error_page/common/localized_error.cc b/components/error_page/common/localized_error.cc
index f4f7354e..1f12beed 100644
--- a/components/error_page/common/localized_error.cc
+++ b/components/error_page/common/localized_error.cc
@@ -9,11 +9,12 @@
#include <memory>
#include <utility>
+#include "base/check_op.h"
#include "base/command_line.h"
#include "base/i18n/rtl.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/field_trial.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
diff --git a/components/error_page/common/net_error_info.cc b/components/error_page/common/net_error_info.cc
index 1420696..fcc6145 100644
--- a/components/error_page/common/net_error_info.cc
+++ b/components/error_page/common/net_error_info.cc
@@ -4,8 +4,8 @@
#include "components/error_page/common/net_error_info.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
namespace error_page {
diff --git a/components/favicon/core/favicon_driver_impl.cc b/components/favicon/core/favicon_driver_impl.cc
index c9d37aa..3817b3f 100644
--- a/components/favicon/core/favicon_driver_impl.cc
+++ b/components/favicon/core/favicon_driver_impl.cc
@@ -6,7 +6,6 @@
#include <memory>
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_util.h"
#include "build/build_config.h"
diff --git a/components/feature_engagement/internal/availability_model_impl.cc b/components/feature_engagement/internal/availability_model_impl.cc
index 8601e1a..4b332cd 100644
--- a/components/feature_engagement/internal/availability_model_impl.cc
+++ b/components/feature_engagement/internal/availability_model_impl.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/weak_ptr.h"
#include "components/feature_engagement/internal/persistent_availability_store.h"
diff --git a/components/feature_engagement/internal/editable_configuration.cc b/components/feature_engagement/internal/editable_configuration.cc
index c023657..64a0d0a5 100644
--- a/components/feature_engagement/internal/editable_configuration.cc
+++ b/components/feature_engagement/internal/editable_configuration.cc
@@ -6,8 +6,8 @@
#include <map>
+#include "base/check.h"
#include "base/feature_list.h"
-#include "base/logging.h"
#include "components/feature_engagement/public/configuration.h"
namespace feature_engagement {
diff --git a/components/feature_engagement/internal/feature_config_condition_validator.cc b/components/feature_engagement/internal/feature_config_condition_validator.cc
index fcbbb27..c7d69954 100644
--- a/components/feature_engagement/internal/feature_config_condition_validator.cc
+++ b/components/feature_engagement/internal/feature_config_condition_validator.cc
@@ -8,8 +8,9 @@
#include <string>
#include <vector>
+#include "base/check.h"
#include "base/feature_list.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "components/feature_engagement/internal/availability_model.h"
#include "components/feature_engagement/internal/display_lock_controller.h"
diff --git a/components/feature_engagement/internal/stats.cc b/components/feature_engagement/internal/stats.cc
index dd101bc..340ad7a0 100644
--- a/components/feature_engagement/internal/stats.cc
+++ b/components/feature_engagement/internal/stats.cc
@@ -6,10 +6,11 @@
#include <string>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/user_metrics.h"
+#include "base/notreached.h"
#include "components/feature_engagement/public/feature_list.h"
namespace feature_engagement {
diff --git a/components/feature_engagement/public/configuration.cc b/components/feature_engagement/public/configuration.cc
index ef0b0e74..8bfaec4 100644
--- a/components/feature_engagement/public/configuration.cc
+++ b/components/feature_engagement/public/configuration.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/optional.h"
namespace feature_engagement {
diff --git a/components/feed/core/feed_content_mutation.cc b/components/feed/core/feed_content_mutation.cc
index 9d3d88c..57502baf 100644
--- a/components/feed/core/feed_content_mutation.cc
+++ b/components/feed/core/feed_content_mutation.cc
@@ -6,7 +6,6 @@
#include <utility>
-#include "base/logging.h"
#include "components/feed/core/feed_content_operation.h"
namespace feed {
diff --git a/components/feed/core/feed_content_operation.cc b/components/feed/core/feed_content_operation.cc
index 650600cd..073de92 100644
--- a/components/feed/core/feed_content_operation.cc
+++ b/components/feed/core/feed_content_operation.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
namespace feed {
diff --git a/components/feed/core/feed_journal_mutation.cc b/components/feed/core/feed_journal_mutation.cc
index d20c2b2..1ff1321 100644
--- a/components/feed/core/feed_journal_mutation.cc
+++ b/components/feed/core/feed_journal_mutation.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
namespace feed {
diff --git a/components/feed/core/feed_journal_operation.cc b/components/feed/core/feed_journal_operation.cc
index 4e56142..803114c 100644
--- a/components/feed/core/feed_journal_operation.cc
+++ b/components/feed/core/feed_journal_operation.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
namespace feed {
diff --git a/components/feed/core/v2/feed_store.cc b/components/feed/core/v2/feed_store.cc
index 8599395..7ae2713 100644
--- a/components/feed/core/v2/feed_store.cc
+++ b/components/feed/core/v2/feed_store.cc
@@ -10,7 +10,7 @@
#include "base/bind_helpers.h"
#include "base/containers/flat_set.h"
#include "base/files/file_path.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
diff --git a/components/feed/core/v2/stream_model.cc b/components/feed/core/v2/stream_model.cc
index 8b34e2c..6e7a2cb 100644
--- a/components/feed/core/v2/stream_model.cc
+++ b/components/feed/core/v2/stream_model.cc
@@ -8,8 +8,8 @@
#include <sstream>
#include <utility>
+#include "base/check.h"
#include "base/json/string_escape.h"
-#include "base/logging.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
#include "components/feed/core/proto/v2/store.pb.h"
diff --git a/components/feed/core/v2/stream_model/feature_tree.cc b/components/feed/core/v2/stream_model/feature_tree.cc
index 5c8373a7..4e6fef5 100644
--- a/components/feed/core/v2/stream_model/feature_tree.cc
+++ b/components/feed/core/v2/stream_model/feature_tree.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <sstream>
-#include "base/logging.h"
+#include "base/check.h"
namespace feed {
namespace stream_model {
diff --git a/components/feed/core/v2/surface_updater.cc b/components/feed/core/v2/surface_updater.cc
index 638fd39..a46bc17 100644
--- a/components/feed/core/v2/surface_updater.cc
+++ b/components/feed/core/v2/surface_updater.cc
@@ -6,7 +6,7 @@
#include <tuple>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/string_number_conversions.h"
#include "components/feed/core/v2/feed_stream.h"
diff --git a/components/feed/core/v2/tasks/load_more_task.cc b/components/feed/core/v2/tasks/load_more_task.cc
index d4486192..61ca148b 100644
--- a/components/feed/core/v2/tasks/load_more_task.cc
+++ b/components/feed/core/v2/tasks/load_more_task.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/time/clock.h"
#include "base/time/tick_clock.h"
#include "base/time/time.h"
diff --git a/components/feed/core/v2/tasks/load_stream_task.cc b/components/feed/core/v2/tasks/load_stream_task.cc
index b6329cb..a66589b7 100644
--- a/components/feed/core/v2/tasks/load_stream_task.cc
+++ b/components/feed/core/v2/tasks/load_stream_task.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/time/clock.h"
#include "base/time/tick_clock.h"
#include "base/time/time.h"
diff --git a/components/feed/core/v2/test/proto_printer.cc b/components/feed/core/v2/test/proto_printer.cc
index 8155ee7..3621b3d 100644
--- a/components/feed/core/v2/test/proto_printer.cc
+++ b/components/feed/core/v2/test/proto_printer.cc
@@ -7,7 +7,6 @@
#include <sstream>
#include <type_traits>
#include "base/json/string_escape.h"
-#include "base/logging.h"
#include "components/feed/core/proto/v2/wire/content_id.pb.h"
#include "components/feed/core/v2/stream_model_update_request.h"
diff --git a/components/filename_generation/filename_generation.cc b/components/filename_generation/filename_generation.cc
index 7367041..33c59f2 100644
--- a/components/filename_generation/filename_generation.cc
+++ b/components/filename_generation/filename_generation.cc
@@ -4,10 +4,10 @@
#include "components/filename_generation/filename_generation.h"
+#include "base/check.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/i18n/file_util_icu.h"
-#include "base/logging.h"
#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/flags_ui/feature_entry.cc b/components/flags_ui/feature_entry.cc
index ede9113..384393f 100644
--- a/components/flags_ui/feature_entry.cc
+++ b/components/flags_ui/feature_entry.cc
@@ -4,7 +4,7 @@
#include "components/flags_ui/feature_entry.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/gcm_driver/crypto/gcm_decryption_result.cc b/components/gcm_driver/crypto/gcm_decryption_result.cc
index a0c4e0d..d5cba73 100644
--- a/components/gcm_driver/crypto/gcm_decryption_result.cc
+++ b/components/gcm_driver/crypto/gcm_decryption_result.cc
@@ -4,7 +4,7 @@
#include "components/gcm_driver/crypto/gcm_decryption_result.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace gcm {
diff --git a/components/gcm_driver/crypto/gcm_key_store_unittest.cc b/components/gcm_driver/crypto/gcm_key_store_unittest.cc
index 2bc7762..1b038f4 100644
--- a/components/gcm_driver/crypto/gcm_key_store_unittest.cc
+++ b/components/gcm_driver/crypto/gcm_key_store_unittest.cc
@@ -9,8 +9,8 @@
#include "base/base64url.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check_op.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/logging.h"
#include "base/run_loop.h"
#include "base/strings/string_util.h"
#include "base/test/gtest_util.h"
diff --git a/components/gcm_driver/fake_gcm_client.cc b/components/gcm_driver/fake_gcm_client.cc
index 54ee61a8..2f2c6ba 100644
--- a/components/gcm_driver/fake_gcm_client.cc
+++ b/components/gcm_driver/fake_gcm_client.cc
@@ -9,8 +9,8 @@
#include <algorithm>
#include "base/bind.h"
+#include "base/check.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/sequenced_task_runner.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string_number_conversions.h"
diff --git a/components/gcm_driver/gcm_delayed_task_controller.cc b/components/gcm_driver/gcm_delayed_task_controller.cc
index 7396330..15006cf 100644
--- a/components/gcm_driver/gcm_delayed_task_controller.cc
+++ b/components/gcm_driver/gcm_delayed_task_controller.cc
@@ -6,7 +6,7 @@
#include <stddef.h>
-#include "base/logging.h"
+#include "base/check.h"
namespace gcm {
diff --git a/components/gcm_driver/gcm_profile_service.cc b/components/gcm_driver/gcm_profile_service.cc
index 9fb90fa..f009045 100644
--- a/components/gcm_driver/gcm_profile_service.cc
+++ b/components/gcm_driver/gcm_profile_service.cc
@@ -7,7 +7,6 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
#include "base/macros.h"
#include "build/build_config.h"
#include "components/gcm_driver/gcm_driver.h"
diff --git a/components/gcm_driver/instance_id/instance_id_profile_service.cc b/components/gcm_driver/instance_id/instance_id_profile_service.cc
index b95ec10..1c6bbad 100644
--- a/components/gcm_driver/instance_id/instance_id_profile_service.cc
+++ b/components/gcm_driver/instance_id/instance_id_profile_service.cc
@@ -4,7 +4,7 @@
#include "components/gcm_driver/instance_id/instance_id_profile_service.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/gcm_driver/gcm_driver.h"
#include "components/gcm_driver/gcm_profile_service.h"
#include "components/gcm_driver/instance_id/instance_id_driver.h"
diff --git a/components/guest_view/browser/guest_view_event.cc b/components/guest_view/browser/guest_view_event.cc
index 472642c..5cce9b0 100644
--- a/components/guest_view/browser/guest_view_event.cc
+++ b/components/guest_view/browser/guest_view_event.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "components/guest_view/browser/guest_view_base.h"
#include "components/guest_view/browser/guest_view_manager.h"
diff --git a/components/gwp_asan/client/guarded_page_allocator_posix.cc b/components/gwp_asan/client/guarded_page_allocator_posix.cc
index 15b0dfc..60aa7c75 100644
--- a/components/gwp_asan/client/guarded_page_allocator_posix.cc
+++ b/components/gwp_asan/client/guarded_page_allocator_posix.cc
@@ -6,7 +6,7 @@
#include <sys/mman.h>
-#include "base/logging.h"
+#include "base/check.h"
namespace gwp_asan {
namespace internal {
diff --git a/components/gwp_asan/client/guarded_page_allocator_win.cc b/components/gwp_asan/client/guarded_page_allocator_win.cc
index cbad675..fac270f 100644
--- a/components/gwp_asan/client/guarded_page_allocator_win.cc
+++ b/components/gwp_asan/client/guarded_page_allocator_win.cc
@@ -6,7 +6,7 @@
#include "components/gwp_asan/client/guarded_page_allocator.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "build/build_config.h"
namespace gwp_asan {
diff --git a/components/gwp_asan/client/sampling_malloc_shims.cc b/components/gwp_asan/client/sampling_malloc_shims.cc
index 7cab0182..cd3f361e6 100644
--- a/components/gwp_asan/client/sampling_malloc_shims.cc
+++ b/components/gwp_asan/client/sampling_malloc_shims.cc
@@ -8,8 +8,8 @@
#include <utility>
#include "base/allocator/allocator_shim.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
-#include "base/logging.h"
#include "base/no_destructor.h"
#include "base/numerics/safe_math.h"
#include "base/process/process_metrics.h"
diff --git a/components/gwp_asan/client/sampling_partitionalloc_shims.cc b/components/gwp_asan/client/sampling_partitionalloc_shims.cc
index f6cf456f..fb9bee0 100644
--- a/components/gwp_asan/client/sampling_partitionalloc_shims.cc
+++ b/components/gwp_asan/client/sampling_partitionalloc_shims.cc
@@ -8,7 +8,6 @@
#include <utility>
#include "base/allocator/partition_allocator/partition_alloc.h"
-#include "base/logging.h"
#include "base/partition_alloc_buildflags.h"
#include "components/crash/core/common/crash_key.h"
#include "components/gwp_asan/client/export.h"
diff --git a/components/history/content/browser/content_visit_delegate.cc b/components/history/content/browser/content_visit_delegate.cc
index 19209ad..becf500d 100644
--- a/components/history/content/browser/content_visit_delegate.cc
+++ b/components/history/content/browser/content_visit_delegate.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "components/history/core/browser/history_backend.h"
diff --git a/components/history/content/browser/download_conversions.cc b/components/history/content/browser/download_conversions.cc
index 71d5a889..0b42941 100644
--- a/components/history/content/browser/download_conversions.cc
+++ b/components/history/content/browser/download_conversions.cc
@@ -4,7 +4,8 @@
#include "components/history/content/browser/download_conversions.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "components/download/public/common/download_danger_type.h"
#include "components/history/core/browser/download_constants.h"
diff --git a/components/history/content/browser/web_contents_top_sites_observer.cc b/components/history/content/browser/web_contents_top_sites_observer.cc
index f0ffbdc8..2945d43d 100644
--- a/components/history/content/browser/web_contents_top_sites_observer.cc
+++ b/components/history/content/browser/web_contents_top_sites_observer.cc
@@ -4,7 +4,7 @@
#include "components/history/content/browser/web_contents_top_sites_observer.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/ptr_util.h"
#include "components/history/core/browser/top_sites.h"
#include "content/public/browser/navigation_details.h"
diff --git a/components/history/core/browser/android/android_urls_sql_handler.cc b/components/history/core/browser/android/android_urls_sql_handler.cc
index db1f0d5..1bf2de9 100644
--- a/components/history/core/browser/android/android_urls_sql_handler.cc
+++ b/components/history/core/browser/android/android_urls_sql_handler.cc
@@ -4,7 +4,7 @@
#include "components/history/core/browser/android/android_urls_sql_handler.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/stl_util.h"
#include "components/history/core/browser/android/android_urls_database.h"
diff --git a/components/history/core/browser/android/favicon_sql_handler.cc b/components/history/core/browser/android/favicon_sql_handler.cc
index 0857764..5f2c06f 100644
--- a/components/history/core/browser/android/favicon_sql_handler.cc
+++ b/components/history/core/browser/android/favicon_sql_handler.cc
@@ -4,7 +4,7 @@
#include "components/history/core/browser/android/favicon_sql_handler.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/ref_counted.h"
#include "base/memory/ref_counted_memory.h"
#include "base/stl_util.h"
diff --git a/components/history/core/browser/android/visit_sql_handler.cc b/components/history/core/browser/android/visit_sql_handler.cc
index 2135344..64b8753 100644
--- a/components/history/core/browser/android/visit_sql_handler.cc
+++ b/components/history/core/browser/android/visit_sql_handler.cc
@@ -6,7 +6,7 @@
#include <stdint.h>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/stl_util.h"
#include "components/history/core/browser/url_database.h"
#include "components/history/core/browser/visit_database.h"
diff --git a/components/history/core/browser/browsing_history_service.cc b/components/history/core/browser/browsing_history_service.cc
index 5fa1dbda..7c456bf 100644
--- a/components/history/core/browser/browsing_history_service.cc
+++ b/components/history/core/browser/browsing_history_service.cc
@@ -12,8 +12,9 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
#include "base/time/default_clock.h"
diff --git a/components/history/core/browser/domain_mixing_metrics.cc b/components/history/core/browser/domain_mixing_metrics.cc
index 1c5df36..841263fb 100644
--- a/components/history/core/browser/domain_mixing_metrics.cc
+++ b/components/history/core/browser/domain_mixing_metrics.cc
@@ -4,9 +4,10 @@
#include "components/history/core/browser/domain_mixing_metrics.h"
+#include "base/check_op.h"
#include "base/containers/flat_map.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "ui/gfx/geometry/safe_integer_conversions.h"
namespace history {
diff --git a/components/history/core/browser/download_types.cc b/components/history/core/browser/download_types.cc
index 68dfa918..033530b2 100644
--- a/components/history/core/browser/download_types.cc
+++ b/components/history/core/browser/download_types.cc
@@ -6,7 +6,8 @@
#include <ostream>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "components/history/core/browser/download_constants.h"
namespace history {
diff --git a/components/history/core/browser/expire_history_backend.cc b/components/history/core/browser/expire_history_backend.cc
index b71a81c..7fee452 100644
--- a/components/history/core/browser/expire_history_backend.cc
+++ b/components/history/core/browser/expire_history_backend.cc
@@ -12,11 +12,11 @@
#include <utility>
#include "base/bind.h"
+#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/containers/flat_set.h"
#include "base/files/file_util.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/sequenced_task_runner.h"
#include "base/stl_util.h"
diff --git a/components/history/core/browser/history_types.cc b/components/history/core/browser/history_types.cc
index a962b81d4..c7a81f6 100644
--- a/components/history/core/browser/history_types.cc
+++ b/components/history/core/browser/history_types.cc
@@ -6,7 +6,8 @@
#include <limits>
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "components/history/core/browser/page_usage_data.h"
diff --git a/components/history/core/browser/in_memory_database.cc b/components/history/core/browser/in_memory_database.cc
index 2d2d229a..24e3d094 100644
--- a/components/history/core/browser/in_memory_database.cc
+++ b/components/history/core/browser/in_memory_database.cc
@@ -5,8 +5,8 @@
#include "components/history/core/browser/in_memory_database.h"
#include "base/files/file_path.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "build/build_config.h"
diff --git a/components/history/core/browser/top_sites_impl.cc b/components/history/core/browser/top_sites_impl.cc
index 0d5e7faf..3d18e0a1 100644
--- a/components/history/core/browser/top_sites_impl.cc
+++ b/components/history/core/browser/top_sites_impl.cc
@@ -11,9 +11,9 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check.h"
#include "base/hash/md5.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string_util.h"
diff --git a/components/history/core/browser/visitsegment_database.cc b/components/history/core/browser/visitsegment_database.cc
index b9448717..e1b6b6011 100644
--- a/components/history/core/browser/visitsegment_database.cc
+++ b/components/history/core/browser/visitsegment_database.cc
@@ -14,7 +14,7 @@
#include <vector>
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
diff --git a/components/history/core/common/thumbnail_score.cc b/components/history/core/common/thumbnail_score.cc
index 2f6ec5c..cfeed7c 100644
--- a/components/history/core/common/thumbnail_score.cc
+++ b/components/history/core/common/thumbnail_score.cc
@@ -4,7 +4,6 @@
#include "components/history/core/common/thumbnail_score.h"
-#include "base/logging.h"
#include "base/strings/stringprintf.h"
namespace history {
diff --git a/components/infobars/core/confirm_infobar_delegate.cc b/components/infobars/core/confirm_infobar_delegate.cc
index fc38dc0..8c9f558 100644
--- a/components/infobars/core/confirm_infobar_delegate.cc
+++ b/components/infobars/core/confirm_infobar_delegate.cc
@@ -4,7 +4,6 @@
#include "components/infobars/core/confirm_infobar_delegate.h"
-#include "base/logging.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/strings/grit/ui_strings.h"
diff --git a/components/infobars/core/infobar.cc b/components/infobars/core/infobar.cc
index d81b02d..9d35751 100644
--- a/components/infobars/core/infobar.cc
+++ b/components/infobars/core/infobar.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "build/build_config.h"
#include "components/infobars/core/infobar_container.h"
#include "components/infobars/core/infobar_manager.h"
diff --git a/components/infobars/core/infobar_container.cc b/components/infobars/core/infobar_container.cc
index 75169447..f4f41cc 100644
--- a/components/infobars/core/infobar_container.cc
+++ b/components/infobars/core/infobar_container.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include "base/auto_reset.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_base.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/metrics_hashes.h"
diff --git a/components/infobars/core/infobar_delegate.cc b/components/infobars/core/infobar_delegate.cc
index f0410a6..4f829ad 100644
--- a/components/infobars/core/infobar_delegate.cc
+++ b/components/infobars/core/infobar_delegate.cc
@@ -4,7 +4,6 @@
#include "components/infobars/core/infobar_delegate.h"
-#include "base/logging.h"
#include "base/no_destructor.h"
#include "build/build_config.h"
#include "components/infobars/core/infobar.h"
diff --git a/components/invalidation/impl/invalidation_service_util.cc b/components/invalidation/impl/invalidation_service_util.cc
index 22ef354..30eb705 100644
--- a/components/invalidation/impl/invalidation_service_util.cc
+++ b/components/invalidation/impl/invalidation_service_util.cc
@@ -5,7 +5,7 @@
#include "components/invalidation/impl/invalidation_service_util.h"
#include "base/base64.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/rand_util.h"
namespace invalidation {
diff --git a/components/invalidation/public/invalidator_state.cc b/components/invalidation/public/invalidator_state.cc
index e1ddab4..5ab31fe 100644
--- a/components/invalidation/public/invalidator_state.cc
+++ b/components/invalidation/public/invalidator_state.cc
@@ -4,7 +4,6 @@
#include "components/invalidation/public/invalidator_state.h"
-#include "base/logging.h"
namespace syncer {
diff --git a/components/keyed_service/content/browser_context_keyed_service_factory.cc b/components/keyed_service/content/browser_context_keyed_service_factory.cc
index 5a91f1ddfd..a1db9c8 100644
--- a/components/keyed_service/content/browser_context_keyed_service_factory.cc
+++ b/components/keyed_service/content/browser_context_keyed_service_factory.cc
@@ -7,7 +7,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ptr_util.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/keyed_service/core/keyed_service.h"
diff --git a/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.cc b/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.cc
index 65f7ed1..525ae36 100644
--- a/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.cc
+++ b/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.cc
@@ -5,7 +5,7 @@
#include "components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/keyed_service/core/refcounted_keyed_service.h"
#include "content/public/browser/browser_context.h"
diff --git a/components/keyed_service/core/dependency_manager.cc b/components/keyed_service/core/dependency_manager.cc
index 56753aa..24377f1 100644
--- a/components/keyed_service/core/dependency_manager.cc
+++ b/components/keyed_service/core/dependency_manager.cc
@@ -5,8 +5,9 @@
#include "components/keyed_service/core/dependency_manager.h"
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/debug/dump_without_crashing.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/supports_user_data.h"
#include "components/keyed_service/core/keyed_service_base_factory.h"
diff --git a/components/keyed_service/core/keyed_service_factory.cc b/components/keyed_service/core/keyed_service_factory.cc
index 3737ac2..f56662e3 100644
--- a/components/keyed_service/core/keyed_service_factory.cc
+++ b/components/keyed_service/core/keyed_service_factory.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/stl_util.h"
#include "components/keyed_service/core/dependency_manager.h"
#include "components/keyed_service/core/keyed_service.h"
diff --git a/components/keyed_service/core/refcounted_keyed_service_factory.cc b/components/keyed_service/core/refcounted_keyed_service_factory.cc
index 4a60e85..c38968c 100644
--- a/components/keyed_service/core/refcounted_keyed_service_factory.cc
+++ b/components/keyed_service/core/refcounted_keyed_service_factory.cc
@@ -4,7 +4,7 @@
#include "components/keyed_service/core/refcounted_keyed_service_factory.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/stl_util.h"
#include "components/keyed_service/core/dependency_manager.h"
#include "components/keyed_service/core/refcounted_keyed_service.h"
diff --git a/components/keyed_service/core/simple_key_map.cc b/components/keyed_service/core/simple_key_map.cc
index 1c3eee9..c1e42c8 100644
--- a/components/keyed_service/core/simple_key_map.cc
+++ b/components/keyed_service/core/simple_key_map.cc
@@ -4,7 +4,7 @@
#include "components/keyed_service/core/simple_key_map.h"
-#include "base/logging.h"
+#include "base/check.h"
SimpleKeyMap::SimpleKeyMap() = default;
diff --git a/components/keyed_service/core/simple_keyed_service_factory.cc b/components/keyed_service/core/simple_keyed_service_factory.cc
index 45655700..826f1d3 100644
--- a/components/keyed_service/core/simple_keyed_service_factory.cc
+++ b/components/keyed_service/core/simple_keyed_service_factory.cc
@@ -5,7 +5,7 @@
#include "components/keyed_service/core/simple_keyed_service_factory.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ptr_util.h"
#include "components/keyed_service/core/keyed_service.h"
#include "components/keyed_service/core/simple_dependency_manager.h"
diff --git a/components/keyed_service/ios/browser_state_keyed_service_factory.cc b/components/keyed_service/ios/browser_state_keyed_service_factory.cc
index a4106db4..2e72b7c 100644
--- a/components/keyed_service/ios/browser_state_keyed_service_factory.cc
+++ b/components/keyed_service/ios/browser_state_keyed_service_factory.cc
@@ -5,7 +5,7 @@
#include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/keyed_service/core/keyed_service.h"
#include "components/keyed_service/ios/browser_state_dependency_manager.h"
#include "ios/web/public/browser_state.h"
diff --git a/components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.cc b/components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.cc
index 1262f65..f345c8f 100644
--- a/components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.cc
+++ b/components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.cc
@@ -5,7 +5,7 @@
#include "components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/keyed_service/core/refcounted_keyed_service.h"
#include "components/keyed_service/ios/browser_state_dependency_manager.h"
#include "ios/web/public/browser_state.h"
diff --git a/components/language/content/browser/ulp_language_code_locator/s2langquadtree_unittest.cc b/components/language/content/browser/ulp_language_code_locator/s2langquadtree_unittest.cc
index d37126f..596ba80 100644
--- a/components/language/content/browser/ulp_language_code_locator/s2langquadtree_unittest.cc
+++ b/components/language/content/browser/ulp_language_code_locator/s2langquadtree_unittest.cc
@@ -7,7 +7,6 @@
#include <string>
#include <vector>
-#include "base/logging.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/s2cellid/src/s2/s2cellid.h"
diff --git a/components/language/content/browser/ulp_language_code_locator/ulp_language_code_locator_unittest.cc b/components/language/content/browser/ulp_language_code_locator/ulp_language_code_locator_unittest.cc
index 9b0bf6a..d13b206 100644
--- a/components/language/content/browser/ulp_language_code_locator/ulp_language_code_locator_unittest.cc
+++ b/components/language/content/browser/ulp_language_code_locator/ulp_language_code_locator_unittest.cc
@@ -10,7 +10,6 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
#include "components/language/content/browser/ulp_language_code_locator/s2langquadtree.h"
#include "components/prefs/testing_pref_service.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/components/leveldb_proto/internal/proto_database_selector.cc b/components/leveldb_proto/internal/proto_database_selector.cc
index 41d0c87f..cfdccd48 100644
--- a/components/leveldb_proto/internal/proto_database_selector.cc
+++ b/components/leveldb_proto/internal/proto_database_selector.cc
@@ -7,8 +7,9 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "components/leveldb_proto/internal/migration_delegate.h"
#include "components/leveldb_proto/internal/shared_proto_database.h"
#include "components/leveldb_proto/internal/shared_proto_database_provider.h"
diff --git a/components/leveldb_proto/internal/shared_proto_database_client.cc b/components/leveldb_proto/internal/shared_proto_database_client.cc
index bd3f283..5bd66d7 100644
--- a/components/leveldb_proto/internal/shared_proto_database_client.cc
+++ b/components/leveldb_proto/internal/shared_proto_database_client.cc
@@ -7,7 +7,8 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/strcat.h"
#include "base/strings/stringprintf.h"
#include "components/leveldb_proto/internal/proto_leveldb_wrapper.h"
diff --git a/components/link_header_util/link_header_util_unittest.cc b/components/link_header_util/link_header_util_unittest.cc
index bd69cd91..bbc53fb 100644
--- a/components/link_header_util/link_header_util_unittest.cc
+++ b/components/link_header_util/link_header_util_unittest.cc
@@ -4,7 +4,6 @@
#include "components/link_header_util/link_header_util.h"
-#include "base/logging.h"
#include "base/run_loop.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/metrics/call_stack_profile_encoding.cc b/components/metrics/call_stack_profile_encoding.cc
index 5b33742..7ce77b0 100644
--- a/components/metrics/call_stack_profile_encoding.cc
+++ b/components/metrics/call_stack_profile_encoding.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "components/metrics/call_stack_profile_encoding.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace metrics {
diff --git a/components/metrics/child_call_stack_profile_collector.cc b/components/metrics/child_call_stack_profile_collector.cc
index 26f68da..be9654a 100644
--- a/components/metrics/child_call_stack_profile_collector.cc
+++ b/components/metrics/child_call_stack_profile_collector.cc
@@ -7,7 +7,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
diff --git a/components/metrics/clean_exit_beacon.cc b/components/metrics/clean_exit_beacon.cc
index 74aefd89..cbf41b2 100644
--- a/components/metrics/clean_exit_beacon.cc
+++ b/components/metrics/clean_exit_beacon.cc
@@ -4,7 +4,7 @@
#include "components/metrics/clean_exit_beacon.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "build/build_config.h"
#include "components/metrics/metrics_pref_names.h"
#include "components/prefs/pref_registry_simple.h"
diff --git a/components/metrics/delegating_provider.cc b/components/metrics/delegating_provider.cc
index 8f55f428..3465e48 100644
--- a/components/metrics/delegating_provider.cc
+++ b/components/metrics/delegating_provider.cc
@@ -5,7 +5,7 @@
#include "components/metrics/delegating_provider.h"
#include "base/barrier_closure.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace metrics {
diff --git a/components/metrics/drive_metrics_provider.cc b/components/metrics/drive_metrics_provider.cc
index ba3b1df..8c774fd 100644
--- a/components/metrics/drive_metrics_provider.cc
+++ b/components/metrics/drive_metrics_provider.cc
@@ -7,9 +7,9 @@
#include "base/base_paths.h"
#include "base/bind.h"
#include "base/callback.h"
+#include "base/check_op.h"
#include "base/files/file_path.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/path_service.h"
#include "base/task/post_task.h"
#include "base/task/task_traits.h"
diff --git a/components/metrics/metrics_provider.cc b/components/metrics/metrics_provider.cc
index 7f04750..d9b3b8f 100644
--- a/components/metrics/metrics_provider.cc
+++ b/components/metrics/metrics_provider.cc
@@ -4,7 +4,7 @@
#include "components/metrics/metrics_provider.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "third_party/metrics_proto/chrome_user_metrics_extension.pb.h"
namespace metrics {
diff --git a/components/metrics/persistent_system_profile_unittest.cc b/components/metrics/persistent_system_profile_unittest.cc
index b3a7ec6..5f37ef68 100644
--- a/components/metrics/persistent_system_profile_unittest.cc
+++ b/components/metrics/persistent_system_profile_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/persistent_memory_allocator.h"
#include "base/rand_util.h"
#include "components/variations/hashing.h"
diff --git a/components/metrics/serialization/metric_sample.cc b/components/metrics/serialization/metric_sample.cc
index 10c9a6d6..3876fc3 100644
--- a/components/metrics/serialization/metric_sample.cc
+++ b/components/metrics/serialization/metric_sample.cc
@@ -7,7 +7,7 @@
#include <string>
#include <vector>
-#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/stringprintf.h"
diff --git a/components/metrics/serialization/serialization_utils_unittest.cc b/components/metrics/serialization/serialization_utils_unittest.cc
index 6bf3c8c..d1091e31 100644
--- a/components/metrics/serialization/serialization_utils_unittest.cc
+++ b/components/metrics/serialization/serialization_utils_unittest.cc
@@ -7,9 +7,9 @@
#include <stddef.h>
#include <stdint.h>
+#include "base/check.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "components/metrics/serialization/metric_sample.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/metrics/stability_metrics_helper.cc b/components/metrics/stability_metrics_helper.cc
index 097f4af..a174330 100644
--- a/components/metrics/stability_metrics_helper.cc
+++ b/components/metrics/stability_metrics_helper.cc
@@ -9,10 +9,11 @@
#include <string>
#include <vector>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/user_metrics.h"
+#include "base/notreached.h"
#include "base/system/sys_info.h"
#include "build/build_config.h"
#include "build/buildflag.h"
diff --git a/components/metrics/version_utils.cc b/components/metrics/version_utils.cc
index 6d2cad2..feaaeb8 100644
--- a/components/metrics/version_utils.cc
+++ b/components/metrics/version_utils.cc
@@ -4,7 +4,7 @@
#include "components/metrics/version_utils.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "build/branding_buildflags.h"
#include "build/build_config.h"
#include "components/version_info/version_info.h"
diff --git a/components/metrics_services_manager/metrics_services_manager.cc b/components/metrics_services_manager/metrics_services_manager.cc
index 3b3a4b5f..f125deb 100644
--- a/components/metrics_services_manager/metrics_services_manager.cc
+++ b/components/metrics_services_manager/metrics_services_manager.cc
@@ -7,8 +7,8 @@
#include <utility>
#include "base/bind.h"
+#include "base/check.h"
#include "base/command_line.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "components/metrics/metrics_service.h"
#include "components/metrics/metrics_service_client.h"
diff --git a/components/mirroring/service/captured_audio_input.cc b/components/mirroring/service/captured_audio_input.cc
index 87533b9..a193816 100644
--- a/components/mirroring/service/captured_audio_input.cc
+++ b/components/mirroring/service/captured_audio_input.cc
@@ -4,7 +4,8 @@
#include "components/mirroring/service/captured_audio_input.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "media/mojo/mojom/audio_data_pipe.mojom.h"
#include "mojo/public/cpp/system/platform_handle.h"
diff --git a/components/mirroring/service/wifi_status_monitor.cc b/components/mirroring/service/wifi_status_monitor.cc
index bfbacc3..dbce9b0 100644
--- a/components/mirroring/service/wifi_status_monitor.cc
+++ b/components/mirroring/service/wifi_status_monitor.cc
@@ -6,8 +6,8 @@
#include "base/bind.h"
#include "base/callback.h"
+#include "base/check.h"
#include "base/json/json_writer.h"
-#include "base/logging.h"
#include "components/mirroring/service/message_dispatcher.h"
namespace mirroring {
diff --git a/components/module_installer/android/module.cc b/components/module_installer/android/module.cc
index 55ccef2..1a6d245 100644
--- a/components/module_installer/android/module.cc
+++ b/components/module_installer/android/module.cc
@@ -9,7 +9,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_restrictions.h"
#include "components/module_installer/android/jni_headers/Module_jni.h"
diff --git a/components/nacl/loader/nacl_helper_win_64.cc b/components/nacl/loader/nacl_helper_win_64.cc
index 767b9bd..c3aa2f7 100644
--- a/components/nacl/loader/nacl_helper_win_64.cc
+++ b/components/nacl/loader/nacl_helper_win_64.cc
@@ -7,8 +7,8 @@
#include <string>
#include <utility>
+#include "base/check.h"
#include "base/command_line.h"
-#include "base/logging.h"
#include "base/message_loop/message_pump_type.h"
#include "base/power_monitor/power_monitor.h"
#include "base/power_monitor/power_monitor_device_source.h"
diff --git a/components/nacl/loader/nacl_main_platform_delegate_win.cc b/components/nacl/loader/nacl_main_platform_delegate_win.cc
index c0caa5e2..200e059 100644
--- a/components/nacl/loader/nacl_main_platform_delegate_win.cc
+++ b/components/nacl/loader/nacl_main_platform_delegate_win.cc
@@ -4,7 +4,7 @@
#include "components/nacl/loader/nacl_main_platform_delegate.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "content/public/common/main_function_params.h"
#include "sandbox/win/src/sandbox.h"
diff --git a/components/nacl/loader/nacl_validation_query.cc b/components/nacl/loader/nacl_validation_query.cc
index 1c69bbc..61147a9 100644
--- a/components/nacl/loader/nacl_validation_query.cc
+++ b/components/nacl/loader/nacl_validation_query.cc
@@ -7,7 +7,7 @@
#include <stdint.h>
#include <string.h>
-#include "base/logging.h"
+#include "base/check.h"
#include "components/nacl/loader/nacl_validation_db.h"
#include "crypto/nss_util.h"
#include "native_client/src/public/validation_cache.h"
diff --git a/components/nacl/loader/nonsfi/nonsfi_sandbox.cc b/components/nacl/loader/nonsfi/nonsfi_sandbox.cc
index ac7bd99..154e96b 100644
--- a/components/nacl/loader/nonsfi/nonsfi_sandbox.cc
+++ b/components/nacl/loader/nonsfi/nonsfi_sandbox.cc
@@ -16,7 +16,7 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "content/public/common/sandbox_init.h"
diff --git a/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc b/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
index e4148f3..a74d7e5 100644
--- a/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
+++ b/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
@@ -20,10 +20,11 @@
#include <unistd.h>
#include "base/callback.h"
+#include "base/check_op.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/files/scoped_file.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "components/nacl/common/nacl_switches.h"
#include "content/public/common/sandbox_init.h"
#include "sandbox/linux/bpf_dsl/bpf_dsl.h"
diff --git a/components/nacl/renderer/platform_info.cc b/components/nacl/renderer/platform_info.cc
index cb1ad6c..ee0c6129 100644
--- a/components/nacl/renderer/platform_info.cc
+++ b/components/nacl/renderer/platform_info.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "base/cpu.h"
-#include "base/logging.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
#include "build/build_config.h"
diff --git a/components/nacl/renderer/plugin/plugin.cc b/components/nacl/renderer/plugin/plugin.cc
index 2c480ac2..763e051 100644
--- a/components/nacl/renderer/plugin/plugin.cc
+++ b/components/nacl/renderer/plugin/plugin.cc
@@ -9,7 +9,7 @@
#include <string>
-#include "base/logging.h"
+#include "base/check.h"
#include "components/nacl/renderer/plugin/nacl_subprocess.h"
#include "components/nacl/renderer/plugin/plugin_error.h"
#include "components/nacl/renderer/plugin/service_runtime.h"
diff --git a/components/nacl/renderer/plugin/pnacl_coordinator.cc b/components/nacl/renderer/plugin/pnacl_coordinator.cc
index 17b93b1..a1d89d7 100644
--- a/components/nacl/renderer/plugin/pnacl_coordinator.cc
+++ b/components/nacl/renderer/plugin/pnacl_coordinator.cc
@@ -8,7 +8,7 @@
#include <sstream>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/numerics/ranges.h"
#include "components/nacl/renderer/plugin/plugin.h"
#include "components/nacl/renderer/plugin/plugin_error.h"
diff --git a/components/nacl/renderer/plugin/pnacl_resources.cc b/components/nacl/renderer/plugin/pnacl_resources.cc
index 862292e..3222416 100644
--- a/components/nacl/renderer/plugin/pnacl_resources.cc
+++ b/components/nacl/renderer/plugin/pnacl_resources.cc
@@ -8,8 +8,9 @@
#include <vector>
+#include "base/check.h"
#include "base/files/file.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "components/nacl/renderer/plugin/plugin.h"
#include "ppapi/c/pp_errors.h"
diff --git a/components/nacl/renderer/plugin/pnacl_translate_thread.cc b/components/nacl/renderer/plugin/pnacl_translate_thread.cc
index 4dd62a92..56fd14e 100644
--- a/components/nacl/renderer/plugin/pnacl_translate_thread.cc
+++ b/components/nacl/renderer/plugin/pnacl_translate_thread.cc
@@ -9,7 +9,7 @@
#include <iterator>
#include <sstream>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/time/time.h"
#include "components/nacl/renderer/plugin/plugin.h"
#include "components/nacl/renderer/plugin/plugin_error.h"
diff --git a/components/nacl/renderer/plugin/service_runtime.cc b/components/nacl/renderer/plugin/service_runtime.cc
index de2b6e2..5721bc34 100644
--- a/components/nacl/renderer/plugin/service_runtime.cc
+++ b/components/nacl/renderer/plugin/service_runtime.cc
@@ -11,7 +11,6 @@
#include <utility>
#include "base/compiler_specific.h"
-#include "base/logging.h"
#include "components/nacl/renderer/plugin/plugin.h"
#include "native_client/src/trusted/service_runtime/nacl_error_code.h"
#include "ppapi/c/pp_errors.h"
diff --git a/components/network_hints/renderer/dns_prefetch_queue.cc b/components/network_hints/renderer/dns_prefetch_queue.cc
index fd4e46a..9636e7d 100644
--- a/components/network_hints/renderer/dns_prefetch_queue.cc
+++ b/components/network_hints/renderer/dns_prefetch_queue.cc
@@ -8,7 +8,7 @@
#include <cstring>
-#include "base/logging.h"
+#include "base/check.h"
namespace network_hints {
diff --git a/components/network_hints/renderer/renderer_dns_prefetch.cc b/components/network_hints/renderer/renderer_dns_prefetch.cc
index f2dea38..b9696f8 100644
--- a/components/network_hints/renderer/renderer_dns_prefetch.cc
+++ b/components/network_hints/renderer/renderer_dns_prefetch.cc
@@ -9,8 +9,8 @@
#include <ctype.h>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "components/network_hints/renderer/dns_prefetch_queue.h"
diff --git a/components/ntp_snippets/category.cc b/components/ntp_snippets/category.cc
index 0ea06474..937a311 100644
--- a/components/ntp_snippets/category.cc
+++ b/components/ntp_snippets/category.cc
@@ -4,7 +4,7 @@
#include "components/ntp_snippets/category.h"
-#include "base/logging.h"
+#include "base/check_op.h"
namespace ntp_snippets {
diff --git a/components/ntp_snippets/remote/cached_image_fetcher.cc b/components/ntp_snippets/remote/cached_image_fetcher.cc
index 261b17e1..bb0bd8c2 100644
--- a/components/ntp_snippets/remote/cached_image_fetcher.cc
+++ b/components/ntp_snippets/remote/cached_image_fetcher.cc
@@ -7,7 +7,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/location.h"
-#include "base/logging.h"
#include "components/image_fetcher/core/image_decoder.h"
#include "components/image_fetcher/core/image_fetcher.h"
#include "components/ntp_snippets/remote/remote_suggestions_database.h"
diff --git a/components/ntp_tiles/metrics.cc b/components/ntp_tiles/metrics.cc
index 96f9dc9..720b3fb 100644
--- a/components/ntp_tiles/metrics.cc
+++ b/components/ntp_tiles/metrics.cc
@@ -6,9 +6,9 @@
#include <string>
-#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/strings/stringprintf.h"
#include "components/ntp_tiles/constants.h"
diff --git a/components/ntp_tiles/webui/ntp_tiles_internals_message_handler.cc b/components/ntp_tiles/webui/ntp_tiles_internals_message_handler.cc
index d484ee6..945bc87d 100644
--- a/components/ntp_tiles/webui/ntp_tiles_internals_message_handler.cc
+++ b/components/ntp_tiles/webui/ntp_tiles_internals_message_handler.cc
@@ -11,10 +11,10 @@
#include "base/bind.h"
#include "base/callback.h"
+#include "base/check_op.h"
#include "base/files/file_util.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
-#include "base/logging.h"
#include "base/task_runner_util.h"
#include "base/values.h"
#include "components/favicon/core/favicon_service.h"
diff --git a/components/offline_pages/content/background_loader/background_loader_contents_stub.cc b/components/offline_pages/content/background_loader/background_loader_contents_stub.cc
index 8b828fe..97b22e9 100644
--- a/components/offline_pages/content/background_loader/background_loader_contents_stub.cc
+++ b/components/offline_pages/content/background_loader/background_loader_contents_stub.cc
@@ -4,7 +4,6 @@
#include "components/offline_pages/content/background_loader/background_loader_contents_stub.h"
-#include "base/logging.h"
#include "content/public/browser/web_contents.h"
#include "content/public/test/web_contents_tester.h"
diff --git a/components/offline_pages/content/renovations/render_frame_script_injector.cc b/components/offline_pages/content/renovations/render_frame_script_injector.cc
index cb4de99..cc90769 100644
--- a/components/offline_pages/content/renovations/render_frame_script_injector.cc
+++ b/components/offline_pages/content/renovations/render_frame_script_injector.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/values.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/common/isolated_world_ids.h"
diff --git a/components/offline_pages/core/archive_validator_unittest.cc b/components/offline_pages/core/archive_validator_unittest.cc
index f9ab9088..9f57a48 100644
--- a/components/offline_pages/core/archive_validator_unittest.cc
+++ b/components/offline_pages/core/archive_validator_unittest.cc
@@ -8,7 +8,6 @@
#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/path_service.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/offline_pages/core/background/cleanup_task.cc b/components/offline_pages/core/background/cleanup_task.cc
index 348fbf4..e8240a9 100644
--- a/components/offline_pages/core/background/cleanup_task.cc
+++ b/components/offline_pages/core/background/cleanup_task.cc
@@ -5,7 +5,7 @@
#include "components/offline_pages/core/background/cleanup_task.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "components/offline_pages/core/background/offliner_policy.h"
#include "components/offline_pages/core/background/offliner_policy_utils.h"
#include "components/offline_pages/core/background/request_coordinator_event_logger.h"
diff --git a/components/offline_pages/core/background/pick_request_task.cc b/components/offline_pages/core/background/pick_request_task.cc
index 348acae..10f858a6 100644
--- a/components/offline_pages/core/background/pick_request_task.cc
+++ b/components/offline_pages/core/background/pick_request_task.cc
@@ -10,7 +10,7 @@
#include <vector>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/time/time.h"
#include "components/offline_pages/core/background/device_conditions.h"
#include "components/offline_pages/core/background/offliner_policy.h"
diff --git a/components/offline_pages/core/background/reconcile_task.cc b/components/offline_pages/core/background/reconcile_task.cc
index bb1b9cb8..3e43c7a 100644
--- a/components/offline_pages/core/background/reconcile_task.cc
+++ b/components/offline_pages/core/background/reconcile_task.cc
@@ -5,7 +5,6 @@
#include "components/offline_pages/core/background/reconcile_task.h"
#include "base/bind.h"
-#include "base/logging.h"
#include "components/offline_pages/core/background/offliner_policy.h"
#include "components/offline_pages/core/background/request_coordinator_event_logger.h"
#include "components/offline_pages/core/background/request_notifier.h"
diff --git a/components/offline_pages/core/background/request_coordinator_unittest.cc b/components/offline_pages/core/background/request_coordinator_unittest.cc
index fc630ce2..24cb7213 100644
--- a/components/offline_pages/core/background/request_coordinator_unittest.cc
+++ b/components/offline_pages/core/background/request_coordinator_unittest.cc
@@ -13,7 +13,6 @@
#include "base/bind_helpers.h"
#include "base/containers/circular_deque.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/synchronization/waitable_event.h"
#include "base/system/sys_info.h"
#include "base/test/bind_test_util.h"
diff --git a/components/offline_pages/core/background_snapshot_controller.cc b/components/offline_pages/core/background_snapshot_controller.cc
index b4a70ae..b13ee560 100644
--- a/components/offline_pages/core/background_snapshot_controller.cc
+++ b/components/offline_pages/core/background_snapshot_controller.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/time/time.h"
#include "components/offline_pages/core/offline_page_feature.h"
diff --git a/components/offline_pages/core/downloads/download_ui_adapter.cc b/components/offline_pages/core/downloads/download_ui_adapter.cc
index ddc767f..b5c12bef 100644
--- a/components/offline_pages/core/downloads/download_ui_adapter.cc
+++ b/components/offline_pages/core/downloads/download_ui_adapter.cc
@@ -8,9 +8,10 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check.h"
#include "base/guid.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/trace_event/trace_event.h"
#include "components/offline_items_collection/core/fail_state.h"
diff --git a/components/offline_pages/core/downloads/offline_item_conversions.cc b/components/offline_pages/core/downloads/offline_item_conversions.cc
index 144730bd..bdb6824 100644
--- a/components/offline_pages/core/downloads/offline_item_conversions.cc
+++ b/components/offline_pages/core/downloads/offline_item_conversions.cc
@@ -4,7 +4,7 @@
#include "components/offline_pages/core/downloads/offline_item_conversions.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/utf_string_conversions.h"
#include "components/offline_items_collection/core/pending_state.h"
#include "components/offline_pages/core/background/save_page_request.h"
diff --git a/components/offline_pages/core/model/model_task_test_base.cc b/components/offline_pages/core/model/model_task_test_base.cc
index ed599a2..6beca73d 100644
--- a/components/offline_pages/core/model/model_task_test_base.cc
+++ b/components/offline_pages/core/model/model_task_test_base.cc
@@ -5,7 +5,6 @@
#include "components/offline_pages/core/model/model_task_test_base.h"
#include "base/files/file_util.h"
-#include "base/logging.h"
#include "base/threading/thread_task_runner_handle.h"
namespace offline_pages {
diff --git a/components/offline_pages/core/model/offline_page_model_utils.cc b/components/offline_pages/core/model/offline_page_model_utils.cc
index d0783e52..3c1c47b 100644
--- a/components/offline_pages/core/model/offline_page_model_utils.cc
+++ b/components/offline_pages/core/model/offline_page_model_utils.cc
@@ -8,7 +8,7 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
diff --git a/components/offline_pages/core/offline_clock.cc b/components/offline_pages/core/offline_clock.cc
index e39d794..eadc5c82 100644
--- a/components/offline_pages/core/offline_clock.cc
+++ b/components/offline_pages/core/offline_clock.cc
@@ -4,7 +4,7 @@
#include "components/offline_pages/core/offline_clock.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/time/default_clock.h"
#include "base/time/time.h"
diff --git a/components/offline_pages/core/offline_page_client_policy.cc b/components/offline_pages/core/offline_page_client_policy.cc
index 8849aac..5e72085 100644
--- a/components/offline_pages/core/offline_page_client_policy.cc
+++ b/components/offline_pages/core/offline_page_client_policy.cc
@@ -9,7 +9,6 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
#include "base/no_destructor.h"
#include "base/time/time.h"
#include "components/offline_pages/core/client_namespace_constants.h"
diff --git a/components/offline_pages/core/offline_page_metadata_store.cc b/components/offline_pages/core/offline_page_metadata_store.cc
index ea753b8..b150e00c 100644
--- a/components/offline_pages/core/offline_page_metadata_store.cc
+++ b/components/offline_pages/core/offline_page_metadata_store.cc
@@ -10,7 +10,6 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/sequenced_task_runner.h"
#include "base/single_thread_task_runner.h"
diff --git a/components/offline_pages/core/prefetch/generate_page_bundle_request.cc b/components/offline_pages/core/prefetch/generate_page_bundle_request.cc
index e9766ef5..98f9aa45 100644
--- a/components/offline_pages/core/prefetch/generate_page_bundle_request.cc
+++ b/components/offline_pages/core/prefetch/generate_page_bundle_request.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/location.h"
-#include "base/logging.h"
#include "components/offline_pages/core/prefetch/prefetch_proto_utils.h"
#include "components/offline_pages/core/prefetch/prefetch_request_fetcher.h"
#include "components/offline_pages/core/prefetch/prefetch_server_urls.h"
diff --git a/components/offline_pages/core/prefetch/get_operation_request.cc b/components/offline_pages/core/prefetch/get_operation_request.cc
index 426da24..95760664 100644
--- a/components/offline_pages/core/prefetch/get_operation_request.cc
+++ b/components/offline_pages/core/prefetch/get_operation_request.cc
@@ -8,7 +8,6 @@
#include "base/bind.h"
#include "base/location.h"
-#include "base/logging.h"
#include "components/offline_pages/core/prefetch/prefetch_proto_utils.h"
#include "components/offline_pages/core/prefetch/prefetch_request_fetcher.h"
#include "components/offline_pages/core/prefetch/prefetch_server_urls.h"
diff --git a/components/offline_pages/core/prefetch/prefetch_dispatcher_impl_unittest.cc b/components/offline_pages/core/prefetch/prefetch_dispatcher_impl_unittest.cc
index 16d37b5..a361c7d 100644
--- a/components/offline_pages/core/prefetch/prefetch_dispatcher_impl_unittest.cc
+++ b/components/offline_pages/core/prefetch/prefetch_dispatcher_impl_unittest.cc
@@ -9,8 +9,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check.h"
#include "base/files/file_util.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop_current.h"
#include "base/run_loop.h"
diff --git a/components/offline_pages/core/prefetch/prefetch_importer_impl.cc b/components/offline_pages/core/prefetch/prefetch_importer_impl.cc
index 3e5d886..ac44fefb 100644
--- a/components/offline_pages/core/prefetch/prefetch_importer_impl.cc
+++ b/components/offline_pages/core/prefetch/prefetch_importer_impl.cc
@@ -5,10 +5,11 @@
#include "components/offline_pages/core/prefetch/prefetch_importer_impl.h"
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/files/file_util.h"
#include "base/guid.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
diff --git a/components/offline_pages/core/prefetch/prefetch_service_impl.cc b/components/offline_pages/core/prefetch/prefetch_service_impl.cc
index dbdbc91..80454b2 100644
--- a/components/offline_pages/core/prefetch/prefetch_service_impl.cc
+++ b/components/offline_pages/core/prefetch/prefetch_service_impl.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/image_fetcher/core/image_fetcher.h"
#include "components/offline_pages/core/client_id.h"
#include "components/offline_pages/core/client_namespace_constants.h"
diff --git a/components/offline_pages/core/prefetch/store/prefetch_store.cc b/components/offline_pages/core/prefetch/store/prefetch_store.cc
index 884d25a..00180321 100644
--- a/components/offline_pages/core/prefetch/store/prefetch_store.cc
+++ b/components/offline_pages/core/prefetch/store/prefetch_store.cc
@@ -10,7 +10,6 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/sequenced_task_runner.h"
#include "base/single_thread_task_runner.h"
diff --git a/components/offline_pages/core/prefetch/tasks/add_unique_urls_task.cc b/components/offline_pages/core/prefetch/tasks/add_unique_urls_task.cc
index 56cc40d..2643485 100644
--- a/components/offline_pages/core/prefetch/tasks/add_unique_urls_task.cc
+++ b/components/offline_pages/core/prefetch/tasks/add_unique_urls_task.cc
@@ -10,7 +10,7 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/metrics/histogram_macros.h"
#include "base/time/time.h"
#include "components/offline_pages/core/offline_clock.h"
diff --git a/components/offline_pages/core/prefetch/tasks/download_cleanup_task.cc b/components/offline_pages/core/prefetch/tasks/download_cleanup_task.cc
index 6423b01..d69523b 100644
--- a/components/offline_pages/core/prefetch/tasks/download_cleanup_task.cc
+++ b/components/offline_pages/core/prefetch/tasks/download_cleanup_task.cc
@@ -8,7 +8,6 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
#include "components/offline_pages/core/offline_store_utils.h"
#include "components/offline_pages/core/prefetch/prefetch_dispatcher.h"
#include "components/offline_pages/core/prefetch/store/prefetch_store.h"
diff --git a/components/offline_pages/core/prefetch/tasks/download_completed_task.cc b/components/offline_pages/core/prefetch/tasks/download_completed_task.cc
index 558fe39c1..86e2cc0f 100644
--- a/components/offline_pages/core/prefetch/tasks/download_completed_task.cc
+++ b/components/offline_pages/core/prefetch/tasks/download_completed_task.cc
@@ -6,8 +6,8 @@
#include "base/bind.h"
#include "base/callback.h"
+#include "base/check.h"
#include "base/files/file_path.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "components/offline_pages/core/offline_store_utils.h"
#include "components/offline_pages/core/prefetch/prefetch_dispatcher.h"
diff --git a/components/offline_pages/core/prefetch/tasks/generate_page_bundle_task_unittest.cc b/components/offline_pages/core/prefetch/tasks/generate_page_bundle_task_unittest.cc
index 5dc4496..e4cdd5e2 100644
--- a/components/offline_pages/core/prefetch/tasks/generate_page_bundle_task_unittest.cc
+++ b/components/offline_pages/core/prefetch/tasks/generate_page_bundle_task_unittest.cc
@@ -6,7 +6,6 @@
#include <utility>
-#include "base/logging.h"
#include "base/test/mock_callback.h"
#include "base/time/time.h"
#include "components/offline_pages/core/prefetch/prefetch_item.h"
diff --git a/components/offline_pages/core/prefetch/tasks/import_archives_task.cc b/components/offline_pages/core/prefetch/tasks/import_archives_task.cc
index e8a2d58..8bb65aa 100644
--- a/components/offline_pages/core/prefetch/tasks/import_archives_task.cc
+++ b/components/offline_pages/core/prefetch/tasks/import_archives_task.cc
@@ -9,7 +9,6 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/files/file_path.h"
-#include "base/logging.h"
#include "components/offline_pages/core/offline_store_utils.h"
#include "components/offline_pages/core/prefetch/prefetch_types.h"
#include "components/offline_pages/core/prefetch/store/prefetch_store.h"
diff --git a/components/offline_pages/core/prefetch/tasks/import_completed_task.cc b/components/offline_pages/core/prefetch/tasks/import_completed_task.cc
index 953a99c1..34af818f 100644
--- a/components/offline_pages/core/prefetch/tasks/import_completed_task.cc
+++ b/components/offline_pages/core/prefetch/tasks/import_completed_task.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
#include "components/offline_pages/core/prefetch/prefetch_dispatcher.h"
#include "components/offline_pages/core/prefetch/prefetch_importer.h"
#include "components/offline_pages/core/prefetch/prefetch_types.h"
diff --git a/components/offline_pages/core/prefetch/tasks/page_bundle_update_task_unittest.cc b/components/offline_pages/core/prefetch/tasks/page_bundle_update_task_unittest.cc
index 6cff4b9..16171910 100644
--- a/components/offline_pages/core/prefetch/tasks/page_bundle_update_task_unittest.cc
+++ b/components/offline_pages/core/prefetch/tasks/page_bundle_update_task_unittest.cc
@@ -4,7 +4,6 @@
#include "components/offline_pages/core/prefetch/tasks/page_bundle_update_task.h"
-#include "base/logging.h"
#include "base/test/mock_callback.h"
#include "components/offline_pages/core/prefetch/prefetch_item.h"
#include "components/offline_pages/core/prefetch/prefetch_types.h"
diff --git a/components/offline_pages/core/prefetch/tasks/sent_get_operation_cleanup_task.cc b/components/offline_pages/core/prefetch/tasks/sent_get_operation_cleanup_task.cc
index c328a2c..342ffc4 100644
--- a/components/offline_pages/core/prefetch/tasks/sent_get_operation_cleanup_task.cc
+++ b/components/offline_pages/core/prefetch/tasks/sent_get_operation_cleanup_task.cc
@@ -10,7 +10,6 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
#include "components/offline_pages/core/prefetch/prefetch_network_request_factory.h"
#include "components/offline_pages/core/prefetch/prefetch_types.h"
#include "components/offline_pages/core/prefetch/store/prefetch_store.h"
diff --git a/components/offline_pages/core/renovations/page_renovation_loader.cc b/components/offline_pages/core/renovations/page_renovation_loader.cc
index 9ec5f489..5e766f4 100644
--- a/components/offline_pages/core/renovations/page_renovation_loader.cc
+++ b/components/offline_pages/core/renovations/page_renovation_loader.cc
@@ -8,7 +8,7 @@
#include <string>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/utf_string_conversions.h"
#include "components/grit/components_resources.h"
#include "ui/base/resource/resource_bundle.h"
diff --git a/components/offline_pages/core/renovations/page_renovator.cc b/components/offline_pages/core/renovations/page_renovator.cc
index ebc1657..95219330 100644
--- a/components/offline_pages/core/renovations/page_renovator.cc
+++ b/components/offline_pages/core/renovations/page_renovator.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/values.h"
namespace offline_pages {
diff --git a/components/offline_pages/core/request_header/offline_page_header.cc b/components/offline_pages/core/request_header/offline_page_header.cc
index 41b4240..cfe925e 100644
--- a/components/offline_pages/core/request_header/offline_page_header.cc
+++ b/components/offline_pages/core/request_header/offline_page_header.cc
@@ -5,7 +5,7 @@
#include "components/offline_pages/core/request_header/offline_page_header.h"
#include "base/base64.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/string_util.h"
diff --git a/components/offline_pages/core/snapshot_controller.cc b/components/offline_pages/core/snapshot_controller.cc
index facb6d92..8734f00f 100644
--- a/components/offline_pages/core/snapshot_controller.cc
+++ b/components/offline_pages/core/snapshot_controller.cc
@@ -5,8 +5,8 @@
#include "components/offline_pages/core/snapshot_controller.h"
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/time/time.h"
#include "components/offline_pages/core/offline_page_feature.h"
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
index 4fbe6e9..0914b6a 100644
--- a/components/omnibox/browser/autocomplete_controller.cc
+++ b/components/omnibox/browser/autocomplete_controller.cc
@@ -14,9 +14,9 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/feature_list.h"
#include "base/format_macros.h"
-#include "base/logging.h"
#include "base/metrics/histogram.h"
#include "base/metrics/histogram_functions.h"
#include "base/optional.h"
diff --git a/components/omnibox/browser/autocomplete_match.cc b/components/omnibox/browser/autocomplete_match.cc
index 0f9ea06..41c5205 100644
--- a/components/omnibox/browser/autocomplete_match.cc
+++ b/components/omnibox/browser/autocomplete_match.cc
@@ -7,10 +7,11 @@
#include <algorithm>
#include <utility>
+#include "base/check_op.h"
#include "base/feature_list.h"
#include "base/i18n/case_conversion.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
diff --git a/components/omnibox/browser/autocomplete_match_type.cc b/components/omnibox/browser/autocomplete_match_type.cc
index 0652262..74a4ab5 100644
--- a/components/omnibox/browser/autocomplete_match_type.cc
+++ b/components/omnibox/browser/autocomplete_match_type.cc
@@ -4,7 +4,8 @@
#include "components/omnibox/browser/autocomplete_match_type.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc
index ed94025e..62cf706 100644
--- a/components/omnibox/browser/autocomplete_result.cc
+++ b/components/omnibox/browser/autocomplete_result.cc
@@ -11,10 +11,11 @@
#include <unordered_set>
#include <vector>
+#include "base/check_op.h"
#include "base/command_line.h"
-#include "base/logging.h"
#include "base/metrics/field_trial_params.h"
#include "base/metrics/histogram_functions.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/omnibox/browser/history_match.cc b/components/omnibox/browser/history_match.cc
index 4498d22..e1b9a87 100644
--- a/components/omnibox/browser/history_match.cc
+++ b/components/omnibox/browser/history_match.cc
@@ -4,7 +4,7 @@
#include "components/omnibox/browser/history_match.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/trace_event/memory_usage_estimator.h"
namespace history {
diff --git a/components/omnibox/browser/history_quick_provider.cc b/components/omnibox/browser/history_quick_provider.cc
index eae7f3c2..7ddcdfd 100644
--- a/components/omnibox/browser/history_quick_provider.cc
+++ b/components/omnibox/browser/history_quick_provider.cc
@@ -9,8 +9,8 @@
#include <algorithm>
#include <vector>
+#include "base/check.h"
#include "base/i18n/break_iterator.h"
-#include "base/logging.h"
#include "base/metrics/field_trial.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
diff --git a/components/omnibox/browser/local_history_zero_suggest_provider.cc b/components/omnibox/browser/local_history_zero_suggest_provider.cc
index 10569f5..458239a9 100644
--- a/components/omnibox/browser/local_history_zero_suggest_provider.cc
+++ b/components/omnibox/browser/local_history_zero_suggest_provider.cc
@@ -8,8 +8,8 @@
#include <string>
#include "base/bind.h"
+#include "base/check.h"
#include "base/i18n/case_conversion.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/omnibox/browser/location_bar_model_impl.cc b/components/omnibox/browser/location_bar_model_impl.cc
index 4897f32d..fe51c47 100644
--- a/components/omnibox/browser/location_bar_model_impl.cc
+++ b/components/omnibox/browser/location_bar_model_impl.cc
@@ -4,9 +4,10 @@
#include "components/omnibox/browser/location_bar_model_impl.h"
+#include "base/check.h"
#include "base/feature_list.h"
-#include "base/logging.h"
#include "base/metrics/field_trial_params.h"
+#include "base/notreached.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "build/build_config.h"
diff --git a/components/omnibox/browser/omnibox_metrics_provider.cc b/components/omnibox/browser/omnibox_metrics_provider.cc
index 602cfc1..95d4343 100644
--- a/components/omnibox/browser/omnibox_metrics_provider.cc
+++ b/components/omnibox/browser/omnibox_metrics_provider.cc
@@ -7,7 +7,6 @@
#include <vector>
#include "base/bind.h"
-#include "base/logging.h"
#include "base/strings/string16.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
diff --git a/components/omnibox/browser/omnibox_prefs.cc b/components/omnibox/browser/omnibox_prefs.cc
index 7dee8937..ccc3bc0 100644
--- a/components/omnibox/browser/omnibox_prefs.cc
+++ b/components/omnibox/browser/omnibox_prefs.cc
@@ -4,7 +4,7 @@
#include "components/omnibox/browser/omnibox_prefs.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/metrics/sparse_histogram.h"
#include "base/stl_util.h"
#include "base/values.h"
diff --git a/components/omnibox/browser/scored_history_match.cc b/components/omnibox/browser/scored_history_match.cc
index 4001ca9..cc89d01 100644
--- a/components/omnibox/browser/scored_history_match.cc
+++ b/components/omnibox/browser/scored_history_match.cc
@@ -10,7 +10,7 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
#include "base/no_destructor.h"
#include "base/numerics/safe_conversions.h"
diff --git a/components/omnibox/browser/search_suggestion_parser.cc b/components/omnibox/browser/search_suggestion_parser.cc
index 3e9438eb..518fbd32 100644
--- a/components/omnibox/browser/search_suggestion_parser.cc
+++ b/components/omnibox/browser/search_suggestion_parser.cc
@@ -9,11 +9,11 @@
#include <algorithm>
#include <memory>
+#include "base/check.h"
#include "base/i18n/icu_string_conversions.h"
#include "base/json/json_reader.h"
#include "base/json/json_string_value_serializer.h"
#include "base/json/json_writer.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/components/omnibox/browser/shortcuts_provider.cc b/components/omnibox/browser/shortcuts_provider.cc
index 0ccff67..45cd082 100644
--- a/components/omnibox/browser/shortcuts_provider.cc
+++ b/components/omnibox/browser/shortcuts_provider.cc
@@ -12,8 +12,8 @@
#include <utility>
#include <vector>
+#include "base/check_op.h"
#include "base/i18n/case_conversion.h"
-#include "base/logging.h"
#include "base/metrics/histogram.h"
#include "base/stl_util.h"
#include "base/strings/strcat.h"
diff --git a/components/omnibox/browser/url_prefix.cc b/components/omnibox/browser/url_prefix.cc
index 6db2bbb6..ee9cd59 100644
--- a/components/omnibox/browser/url_prefix.cc
+++ b/components/omnibox/browser/url_prefix.cc
@@ -4,8 +4,8 @@
#include "components/omnibox/browser/url_prefix.h"
+#include "base/check_op.h"
#include "base/i18n/case_conversion.h"
-#include "base/logging.h"
#include "base/no_destructor.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/omnibox/browser/verbatim_match.cc b/components/omnibox/browser/verbatim_match.cc
index 82a42aec..3ddef34f 100644
--- a/components/omnibox/browser/verbatim_match.cc
+++ b/components/omnibox/browser/verbatim_match.cc
@@ -4,7 +4,6 @@
#include "components/omnibox/browser/verbatim_match.h"
-#include "base/logging.h"
#include "components/omnibox/browser/autocomplete_classifier.h"
#include "components/omnibox/browser/autocomplete_input.h"
#include "components/omnibox/browser/autocomplete_provider_client.h"
diff --git a/components/openscreen_platform/network_util.cc b/components/openscreen_platform/network_util.cc
index 564220fa..c5a883dac5 100644
--- a/components/openscreen_platform/network_util.cc
+++ b/components/openscreen_platform/network_util.cc
@@ -7,7 +7,7 @@
#include <array>
#include <memory>
-#include "base/logging.h"
+#include "base/notreached.h"
#include "net/base/address_family.h"
#include "net/base/ip_endpoint.h"
#include "net/base/net_errors.h"
diff --git a/components/openscreen_platform/tls_connection_factory.cc b/components/openscreen_platform/tls_connection_factory.cc
index b417cf20..01424aa 100644
--- a/components/openscreen_platform/tls_connection_factory.cc
+++ b/components/openscreen_platform/tls_connection_factory.cc
@@ -7,7 +7,7 @@
#include <openssl/pool.h>
#include <utility>
-#include "base/logging.h"
+#include "base/notreached.h"
#include "components/openscreen_platform/network_context.h"
#include "components/openscreen_platform/network_util.h"
#include "components/openscreen_platform/tls_client_connection.h"
diff --git a/components/optimization_guide/bloom_filter.cc b/components/optimization_guide/bloom_filter.cc
index 4be1766..20e6fb19 100644
--- a/components/optimization_guide/bloom_filter.cc
+++ b/components/optimization_guide/bloom_filter.cc
@@ -7,7 +7,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "third_party/smhasher/src/MurmurHash3.h"
namespace optimization_guide {
diff --git a/components/optimization_guide/url_pattern_with_wildcards.cc b/components/optimization_guide/url_pattern_with_wildcards.cc
index 6d6e1ea..b79e31f1 100644
--- a/components/optimization_guide/url_pattern_with_wildcards.cc
+++ b/components/optimization_guide/url_pattern_with_wildcards.cc
@@ -4,7 +4,7 @@
#include "components/optimization_guide/url_pattern_with_wildcards.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
namespace {
diff --git a/components/os_crypt/key_storage_kwallet.cc b/components/os_crypt/key_storage_kwallet.cc
index cd68ec0..2b12b9e 100644
--- a/components/os_crypt/key_storage_kwallet.cc
+++ b/components/os_crypt/key_storage_kwallet.cc
@@ -7,7 +7,7 @@
#include <utility>
#include "base/base64.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/rand_util.h"
#include "components/os_crypt/kwallet_dbus.h"
#include "dbus/bus.h"
diff --git a/components/os_crypt/key_storage_kwallet_unittest.cc b/components/os_crypt/key_storage_kwallet_unittest.cc
index 8866d73..6f512ac 100644
--- a/components/os_crypt/key_storage_kwallet_unittest.cc
+++ b/components/os_crypt/key_storage_kwallet_unittest.cc
@@ -4,7 +4,6 @@
#include "components/os_crypt/key_storage_kwallet.h"
-#include "base/logging.h"
#include "base/nix/xdg_util.h"
#include "build/branding_buildflags.h"
#include "dbus/message.h"
diff --git a/components/os_crypt/key_storage_libsecret_unittest.cc b/components/os_crypt/key_storage_libsecret_unittest.cc
index 6074987..c1c9fb4 100644
--- a/components/os_crypt/key_storage_libsecret_unittest.cc
+++ b/components/os_crypt/key_storage_libsecret_unittest.cc
@@ -6,7 +6,6 @@
#include <unordered_map>
#include "base/lazy_instance.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "components/os_crypt/key_storage_libsecret.h"
#include "components/os_crypt/libsecret_util_linux.h"
diff --git a/components/os_crypt/key_storage_util_linux_unittest.cc b/components/os_crypt/key_storage_util_linux_unittest.cc
index ad48d52..ce99d13 100644
--- a/components/os_crypt/key_storage_util_linux_unittest.cc
+++ b/components/os_crypt/key_storage_util_linux_unittest.cc
@@ -5,7 +5,6 @@
#include "components/os_crypt/key_storage_util_linux.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/os_crypt/kwallet_dbus_unittest.cc b/components/os_crypt/kwallet_dbus_unittest.cc
index 0297875b..6d990d3 100644
--- a/components/os_crypt/kwallet_dbus_unittest.cc
+++ b/components/os_crypt/kwallet_dbus_unittest.cc
@@ -7,7 +7,6 @@
#include <memory>
#include <string>
-#include "base/logging.h"
#include "base/nix/xdg_util.h"
#include "dbus/message.h"
#include "dbus/mock_bus.h"
diff --git a/components/os_crypt/os_crypt_posix.cc b/components/os_crypt/os_crypt_posix.cc
index 9f190f7c..cfcf068 100644
--- a/components/os_crypt/os_crypt_posix.cc
+++ b/components/os_crypt/os_crypt_posix.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "crypto/encryptor.h"
diff --git a/components/ownership/mock_owner_key_util.cc b/components/ownership/mock_owner_key_util.cc
index 32ed743..cb2f7c3 100644
--- a/components/ownership/mock_owner_key_util.cc
+++ b/components/ownership/mock_owner_key_util.cc
@@ -6,8 +6,8 @@
#include <pk11pub.h>
+#include "base/check.h"
#include "base/files/file_path.h"
-#include "base/logging.h"
#include "crypto/nss_key_util.h"
#include "crypto/nss_util.h"
#include "crypto/rsa_private_key.h"
diff --git a/components/page_info/android/certificate_viewer_android.cc b/components/page_info/android/certificate_viewer_android.cc
index 10ad6e6..56adede 100644
--- a/components/page_info/android/certificate_viewer_android.cc
+++ b/components/page_info/android/certificate_viewer_android.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "base/android/jni_string.h"
-#include "base/logging.h"
#include "components/page_info/android/jni_headers/CertificateViewer_jni.h"
#include "components/strings/grit/components_strings.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/components/page_load_metrics/browser/page_load_metrics_test_waiter.cc b/components/page_load_metrics/browser/page_load_metrics_test_waiter.cc
index 4e2d8b2..6b858e89 100644
--- a/components/page_load_metrics/browser/page_load_metrics_test_waiter.cc
+++ b/components/page_load_metrics/browser/page_load_metrics_test_waiter.cc
@@ -4,7 +4,7 @@
#include "components/page_load_metrics/browser/page_load_metrics_test_waiter.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/page_load_metrics/browser/page_load_metrics_observer.h"
#include "components/page_load_metrics/common/page_load_metrics.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/page_load_metrics/browser/page_load_tracker.cc b/components/page_load_metrics/browser/page_load_tracker.cc
index 9e1c1eb..b9cd083 100644
--- a/components/page_load_metrics/browser/page_load_tracker.cc
+++ b/components/page_load_metrics/browser/page_load_tracker.cc
@@ -9,8 +9,9 @@
#include <string>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/time/default_tick_clock.h"
#include "base/trace_event/trace_event.h"
#include "components/page_load_metrics/browser/page_load_metrics_embedder_interface.h"
diff --git a/components/paint_preview/common/paint_preview_tracker.cc b/components/paint_preview/common/paint_preview_tracker.cc
index b584d36d..a5268d9a 100644
--- a/components/paint_preview/common/paint_preview_tracker.cc
+++ b/components/paint_preview/common/paint_preview_tracker.cc
@@ -9,7 +9,7 @@
#include <string>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/stl_util.h"
#include "components/paint_preview/common/glyph_usage.h"
#include "components/paint_preview/common/mojom/paint_preview_recorder.mojom.h"
diff --git a/components/password_manager/content/browser/form_submission_tracker_util.cc b/components/password_manager/content/browser/form_submission_tracker_util.cc
index 1b46311..3631d1b 100644
--- a/components/password_manager/content/browser/form_submission_tracker_util.cc
+++ b/components/password_manager/content/browser/form_submission_tracker_util.cc
@@ -4,7 +4,7 @@
#include "components/password_manager/content/browser/form_submission_tracker_util.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/password_manager/core/browser/form_submission_observer.h"
namespace password_manager {
diff --git a/components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler.cc b/components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler.cc
index 77878eb..bd762ad 100644
--- a/components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler.cc
+++ b/components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler.cc
@@ -7,7 +7,7 @@
#include <stdint.h>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/rand_util.h"
#include "base/sequenced_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/components/password_manager/core/browser/export/csv_writer.cc b/components/password_manager/core/browser/export/csv_writer.cc
index b3ea46b..7f5bbc6 100644
--- a/components/password_manager/core/browser/export/csv_writer.cc
+++ b/components/password_manager/core/browser/export/csv_writer.cc
@@ -4,7 +4,7 @@
#include "components/password_manager/core/browser/export/csv_writer.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/string_util.h"
#include "build/build_config.h"
diff --git a/components/password_manager/core/browser/form_parsing/fuzzer/data_accessor.cc b/components/password_manager/core/browser/form_parsing/fuzzer/data_accessor.cc
index 2d1df77..0c69b10 100644
--- a/components/password_manager/core/browser/form_parsing/fuzzer/data_accessor.cc
+++ b/components/password_manager/core/browser/form_parsing/fuzzer/data_accessor.cc
@@ -9,7 +9,7 @@
#include <algorithm>
#include <bitset>
-#include "base/logging.h"
+#include "base/check_op.h"
namespace password_manager {
diff --git a/components/password_manager/core/browser/form_parsing/password_field_prediction.cc b/components/password_manager/core/browser/form_parsing/password_field_prediction.cc
index 3bdfb029..8230e10 100644
--- a/components/password_manager/core/browser/form_parsing/password_field_prediction.cc
+++ b/components/password_manager/core/browser/form_parsing/password_field_prediction.cc
@@ -4,7 +4,6 @@
#include "components/password_manager/core/browser/form_parsing/password_field_prediction.h"
-#include "base/logging.h"
#include "components/autofill/core/browser/form_structure.h"
#include "components/autofill/core/common/form_data.h"
#include "components/autofill/core/common/signatures_util.h"
diff --git a/components/password_manager/core/browser/generation/password_generator.cc b/components/password_manager/core/browser/generation/password_generator.cc
index 5a35675..edfa289 100644
--- a/components/password_manager/core/browser/generation/password_generator.cc
+++ b/components/password_manager/core/browser/generation/password_generator.cc
@@ -10,7 +10,7 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/rand_util.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/browser/proto/password_requirements.pb.h"
diff --git a/components/password_manager/core/browser/generation/password_generator_unittest.cc b/components/password_manager/core/browser/generation/password_generator_unittest.cc
index 1c08e7a..3d087ef 100644
--- a/components/password_manager/core/browser/generation/password_generator_unittest.cc
+++ b/components/password_manager/core/browser/generation/password_generator_unittest.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/logging.h"
+#include "base/notreached.h"
#include "components/autofill/core/browser/proto/password_requirements.pb.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_unittest.cc b/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_unittest.cc
index 93da826..c280872 100644
--- a/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_unittest.cc
+++ b/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_unittest.cc
@@ -4,7 +4,6 @@
#include "components/password_manager/core/browser/generation/password_requirements_spec_fetcher_impl.h"
-#include "base/logging.h"
#include "base/test/bind_test_util.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/task_environment.h"
diff --git a/components/password_manager/core/browser/import/csv_field_parser.cc b/components/password_manager/core/browser/import/csv_field_parser.cc
index ae1b70a..8b010a3 100644
--- a/components/password_manager/core/browser/import/csv_field_parser.cc
+++ b/components/password_manager/core/browser/import/csv_field_parser.cc
@@ -4,7 +4,8 @@
#include "components/password_manager/core/browser/import/csv_field_parser.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
namespace password_manager {
diff --git a/components/password_manager/core/browser/import/csv_password.cc b/components/password_manager/core/browser/import/csv_password.cc
index dabc07f..3628823 100644
--- a/components/password_manager/core/browser/import/csv_password.cc
+++ b/components/password_manager/core/browser/import/csv_password.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
diff --git a/components/password_manager/core/browser/import/csv_password_iterator.cc b/components/password_manager/core/browser/import/csv_password_iterator.cc
index ed96f5a0f..9ad5593 100644
--- a/components/password_manager/core/browser/import/csv_password_iterator.cc
+++ b/components/password_manager/core/browser/import/csv_password_iterator.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/string_util.h"
#include "base/template_util.h"
diff --git a/components/password_manager/core/browser/import/csv_reader.cc b/components/password_manager/core/browser/import/csv_reader.cc
index 8d322f26..abdeceac 100644
--- a/components/password_manager/core/browser/import/csv_reader.cc
+++ b/components/password_manager/core/browser/import/csv_reader.cc
@@ -9,7 +9,7 @@
#include <algorithm>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/macros.h"
#include "base/strings/string_util.h"
#include "components/password_manager/core/browser/import/csv_field_parser.h"
diff --git a/components/password_manager/core/browser/leak_detection/bulk_leak_check_impl.cc b/components/password_manager/core/browser/leak_detection/bulk_leak_check_impl.cc
index 7e724b6..bb1c2acb0 100644
--- a/components/password_manager/core/browser/leak_detection/bulk_leak_check_impl.cc
+++ b/components/password_manager/core/browser/leak_detection/bulk_leak_check_impl.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/optional.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/post_task.h"
diff --git a/components/password_manager/core/browser/multi_store_form_fetcher.cc b/components/password_manager/core/browser/multi_store_form_fetcher.cc
index 70082c5..a7549b1 100644
--- a/components/password_manager/core/browser/multi_store_form_fetcher.cc
+++ b/components/password_manager/core/browser/multi_store_form_fetcher.cc
@@ -4,7 +4,7 @@
#include "components/password_manager/core/browser/multi_store_form_fetcher.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "build/build_config.h"
#include "components/autofill/core/common/save_password_progress_logger.h"
#include "components/password_manager/core/browser/password_feature_manager.h"
diff --git a/components/password_manager/core/browser/password_form_metrics_recorder.cc b/components/password_manager/core/browser/password_form_metrics_recorder.cc
index d21e8732a..649a04f8 100644
--- a/components/password_manager/core/browser/password_form_metrics_recorder.cc
+++ b/components/password_manager/core/browser/password_form_metrics_recorder.cc
@@ -6,9 +6,10 @@
#include <algorithm>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/user_metrics.h"
+#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
#include "base/stl_util.h"
#include "components/autofill/core/common/form_data.h"
diff --git a/components/password_manager/core/browser/password_form_metrics_recorder_unittest.cc b/components/password_manager/core/browser/password_form_metrics_recorder_unittest.cc
index a66d1c8..0a6cf23b 100644
--- a/components/password_manager/core/browser/password_form_metrics_recorder_unittest.cc
+++ b/components/password_manager/core/browser/password_form_metrics_recorder_unittest.cc
@@ -4,8 +4,8 @@
#include "components/password_manager/core/browser/password_form_metrics_recorder.h"
-#include "base/logging.h"
#include "base/metrics/metrics_hashes.h"
+#include "base/notreached.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/metrics/histogram_tester.h"
diff --git a/components/password_manager/core/browser/password_requirements_service_unittest.cc b/components/password_manager/core/browser/password_requirements_service_unittest.cc
index dd2f128..6837fbc 100644
--- a/components/password_manager/core/browser/password_requirements_service_unittest.cc
+++ b/components/password_manager/core/browser/password_requirements_service_unittest.cc
@@ -6,7 +6,6 @@
#include <map>
-#include "base/logging.h"
#include "base/test/bind_test_util.h"
#include "components/autofill/core/browser/proto/password_requirements.pb.h"
#include "components/password_manager/core/browser/generation/password_requirements_spec_fetcher.h"
diff --git a/components/password_manager/core/browser/psl_matching_helper.cc b/components/password_manager/core/browser/psl_matching_helper.cc
index 4a81f92..b7dca4c 100644
--- a/components/password_manager/core/browser/psl_matching_helper.cc
+++ b/components/password_manager/core/browser/psl_matching_helper.cc
@@ -7,7 +7,6 @@
#include <memory>
#include <ostream>
-#include "base/logging.h"
#include "base/strings/string_util.h"
#include "components/autofill/core/common/password_form.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
diff --git a/components/password_manager/core/browser/sync/password_sync_bridge.cc b/components/password_manager/core/browser/sync/password_sync_bridge.cc
index 1a921cf9..289defb 100644
--- a/components/password_manager/core/browser/sync/password_sync_bridge.cc
+++ b/components/password_manager/core/browser/sync/password_sync_bridge.cc
@@ -8,8 +8,9 @@
#include "base/auto_reset.h"
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_functions.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
diff --git a/components/password_manager/core/browser/test_password_store.cc b/components/password_manager/core/browser/test_password_store.cc
index 527083c..08e02620 100644
--- a/components/password_manager/core/browser/test_password_store.cc
+++ b/components/password_manager/core/browser/test_password_store.cc
@@ -8,7 +8,8 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "components/autofill/core/common/password_form.h"
diff --git a/components/password_manager/core/browser/ui/bulk_leak_check_service_adapter.cc b/components/password_manager/core/browser/ui/bulk_leak_check_service_adapter.cc
index ba51a3c..cf7fd78 100644
--- a/components/password_manager/core/browser/ui/bulk_leak_check_service_adapter.cc
+++ b/components/password_manager/core/browser/ui/bulk_leak_check_service_adapter.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <tuple>
+#include "base/check.h"
#include "base/containers/flat_set.h"
-#include "base/logging.h"
#include "components/autofill/core/common/password_form.h"
#include "components/password_manager/core/browser/leak_detection/bulk_leak_check.h"
#include "components/password_manager/core/browser/leak_detection/encryption_utils.h"
diff --git a/components/password_manager/core/browser/ui/compromised_credentials_provider.cc b/components/password_manager/core/browser/ui/compromised_credentials_provider.cc
index 671fcc49..9478aab 100644
--- a/components/password_manager/core/browser/ui/compromised_credentials_provider.cc
+++ b/components/password_manager/core/browser/ui/compromised_credentials_provider.cc
@@ -9,7 +9,6 @@
#include <set>
#include "base/containers/flat_set.h"
-#include "base/logging.h"
#include "base/strings/string16.h"
#include "components/autofill/core/common/password_form.h"
#include "components/password_manager/core/browser/compromised_credentials_table.h"
diff --git a/components/password_manager/core/browser/ui/saved_passwords_presenter.cc b/components/password_manager/core/browser/ui/saved_passwords_presenter.cc
index c725d03..8cb0ff2 100644
--- a/components/password_manager/core/browser/ui/saved_passwords_presenter.cc
+++ b/components/password_manager/core/browser/ui/saved_passwords_presenter.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/stl_util.h"
#include "base/strings/string16.h"
#include "components/autofill/core/common/password_form.h"
diff --git a/components/password_manager/core/browser/votes_uploader.cc b/components/password_manager/core/browser/votes_uploader.cc
index 9fd8dcc..79e5726 100644
--- a/components/password_manager/core/browser/votes_uploader.cc
+++ b/components/password_manager/core/browser/votes_uploader.cc
@@ -8,8 +8,8 @@
#include <algorithm>
#include <iostream>
#include <utility>
+#include "base/check_op.h"
#include "base/hash/hash.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/optional.h"
#include "base/rand_util.h"
diff --git a/components/password_manager/core/common/credential_manager_types.cc b/components/password_manager/core/common/credential_manager_types.cc
index 15d20d9..6d90c1e7 100644
--- a/components/password_manager/core/common/credential_manager_types.cc
+++ b/components/password_manager/core/common/credential_manager_types.cc
@@ -4,7 +4,6 @@
#include "components/password_manager/core/common/credential_manager_types.h"
-#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "components/autofill/core/common/password_form.h"
diff --git a/components/payments/content/android/payment_manifest_parser_android.cc b/components/payments/content/android/payment_manifest_parser_android.cc
index 4ce8749..0a6c5755 100644
--- a/components/payments/content/android/payment_manifest_parser_android.cc
+++ b/components/payments/content/android/payment_manifest_parser_android.cc
@@ -13,7 +13,7 @@
#include "base/android/scoped_java_ref.h"
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/numerics/safe_conversions.h"
#include "components/payments/content/android/jni_headers/PaymentManifestParser_jni.h"
#include "components/payments/content/developer_console_logger.h"
diff --git a/components/payments/content/manifest_verifier.cc b/components/payments/content/manifest_verifier.cc
index e5c7099..db2ef85 100644
--- a/components/payments/content/manifest_verifier.cc
+++ b/components/payments/content/manifest_verifier.cc
@@ -9,7 +9,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "components/payments/content/payment_manifest_web_data_service.h"
diff --git a/components/payments/content/payment_details_converter.cc b/components/payments/content/payment_details_converter.cc
index 758e1c6..ad8c1e53c1 100644
--- a/components/payments/content/payment_details_converter.cc
+++ b/components/payments/content/payment_details_converter.cc
@@ -7,7 +7,7 @@
#include <utility>
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check.h"
namespace payments {
diff --git a/components/payments/content/payment_method_manifest_table.cc b/components/payments/content/payment_method_manifest_table.cc
index 836e78d..cc0cb0f 100644
--- a/components/payments/content/payment_method_manifest_table.cc
+++ b/components/payments/content/payment_method_manifest_table.cc
@@ -6,7 +6,7 @@
#include <time.h>
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/time/time.h"
#include "components/webdata/common/web_database.h"
#include "sql/statement.h"
diff --git a/components/payments/content/payment_request_display_manager.cc b/components/payments/content/payment_request_display_manager.cc
index 9e67406..6c50de6 100644
--- a/components/payments/content/payment_request_display_manager.cc
+++ b/components/payments/content/payment_request_display_manager.cc
@@ -4,7 +4,7 @@
#include "components/payments/content/payment_request_display_manager.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/payments/content/content_payment_request_delegate.h"
namespace payments {
diff --git a/components/payments/content/payment_request_spec.cc b/components/payments/content/payment_request_spec.cc
index 3573112..65467baf57 100644
--- a/components/payments/content/payment_request_spec.cc
+++ b/components/payments/content/payment_request_spec.cc
@@ -6,8 +6,9 @@
#include <utility>
+#include "base/check.h"
#include "base/feature_list.h"
-#include "base/logging.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/components/payments/content/payment_request_web_contents_manager.cc b/components/payments/content/payment_request_web_contents_manager.cc
index 5326902..3bcda4e2 100644
--- a/components/payments/content/payment_request_web_contents_manager.cc
+++ b/components/payments/content/payment_request_web_contents_manager.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "components/payments/content/content_payment_request_delegate.h"
#include "components/payments/content/payment_request.h"
#include "components/payments/content/payment_request_display_manager.h"
diff --git a/components/payments/content/payment_response_helper.cc b/components/payments/content/payment_response_helper.cc
index 2b69fca..9f3c676 100644
--- a/components/payments/content/payment_response_helper.cc
+++ b/components/payments/content/payment_response_helper.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/string_split.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/browser/autofill_data_util.h"
diff --git a/components/payments/content/service_worker_payment_app_factory.cc b/components/payments/content/service_worker_payment_app_factory.cc
index 047613ad..02bb0ab4 100644
--- a/components/payments/content/service_worker_payment_app_factory.cc
+++ b/components/payments/content/service_worker_payment_app_factory.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/weak_ptr.h"
#include "components/payments/content/content_payment_request_delegate.h"
#include "components/payments/content/payment_manifest_web_data_service.h"
diff --git a/components/payments/content/service_worker_payment_app_finder.cc b/components/payments/content/service_worker_payment_app_finder.cc
index 72c000a..4fa55d89 100644
--- a/components/payments/content/service_worker_payment_app_finder.cc
+++ b/components/payments/content/service_worker_payment_app_finder.cc
@@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/ref_counted.h"
#include "base/memory/singleton.h"
#include "base/stl_util.h"
diff --git a/components/payments/content/utility/fingerprint_parser.cc b/components/payments/content/utility/fingerprint_parser.cc
index 6237db66..1a24e4a0 100644
--- a/components/payments/content/utility/fingerprint_parser.cc
+++ b/components/payments/content/utility/fingerprint_parser.cc
@@ -4,7 +4,7 @@
#include "components/payments/content/utility/fingerprint_parser.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
diff --git a/components/payments/content/utility/fingerprint_parser_fuzzer.cc b/components/payments/content/utility/fingerprint_parser_fuzzer.cc
index a98c5579..0d9b5afc 100644
--- a/components/payments/content/utility/fingerprint_parser_fuzzer.cc
+++ b/components/payments/content/utility/fingerprint_parser_fuzzer.cc
@@ -6,7 +6,6 @@
#include <stdint.h>
#include <string>
-#include "base/logging.h"
#include "components/payments/content/utility/fingerprint_parser.h"
#include "components/payments/core/error_logger.h"
diff --git a/components/payments/content/utility/payment_manifest_parser.cc b/components/payments/content/utility/payment_manifest_parser.cc
index 88719c50..5aaa9ff 100644
--- a/components/payments/content/utility/payment_manifest_parser.cc
+++ b/components/payments/content/utility/payment_manifest_parser.cc
@@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "base/strings/string_number_conversions.h"
diff --git a/components/payments/content/utility/payment_method_manifest_parser_fuzzer.cc b/components/payments/content/utility/payment_method_manifest_parser_fuzzer.cc
index 6245c7a6..d4f2a5a4 100644
--- a/components/payments/content/utility/payment_method_manifest_parser_fuzzer.cc
+++ b/components/payments/content/utility/payment_method_manifest_parser_fuzzer.cc
@@ -8,10 +8,10 @@
#include <vector>
#include "base/at_exit.h"
+#include "base/check.h"
#include "base/command_line.h"
#include "base/i18n/icu_util.h"
#include "base/json/json_reader.h"
-#include "base/logging.h"
#include "components/payments/content/utility/payment_manifest_parser.h"
#include "components/payments/core/error_logger.h"
#include "url/gurl.h"
diff --git a/components/payments/content/web_app_manifest_section_table.cc b/components/payments/content/web_app_manifest_section_table.cc
index 5aca385..678fbb3 100644
--- a/components/payments/content/web_app_manifest_section_table.cc
+++ b/components/payments/content/web_app_manifest_section_table.cc
@@ -8,7 +8,8 @@
#include <time.h>
#include <memory>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/time/time.h"
#include "components/webdata/common/web_database.h"
#include "sql/statement.h"
diff --git a/components/payments/core/error_message_util.cc b/components/payments/core/error_message_util.cc
index 0bd30d2..1fdf75f 100644
--- a/components/payments/core/error_message_util.cc
+++ b/components/payments/core/error_message_util.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <vector>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/string_util.h"
#include "components/payments/core/native_error_strings.h"
diff --git a/components/payments/core/payment_manifest_downloader.cc b/components/payments/core/payment_manifest_downloader.cc
index b172853..85f2e1e7 100644
--- a/components/payments/core/payment_manifest_downloader.cc
+++ b/components/payments/core/payment_manifest_downloader.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/optional.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/components/payments/core/strings_util.cc b/components/payments/core/strings_util.cc
index 1a8b0be..61e4c3f 100644
--- a/components/payments/core/strings_util.cc
+++ b/components/payments/core/strings_util.cc
@@ -6,7 +6,7 @@
#include <vector>
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "components/autofill/core/browser/data_model/autofill_profile.h"
#include "components/autofill/core/browser/field_types.h"
diff --git a/components/performance_manager/graph/frame_node.cc b/components/performance_manager/graph/frame_node.cc
index 372dc1a..58eec2e 100644
--- a/components/performance_manager/graph/frame_node.cc
+++ b/components/performance_manager/graph/frame_node.cc
@@ -4,7 +4,6 @@
#include "components/performance_manager/public/graph/frame_node.h"
-#include "base/logging.h"
#include "components/performance_manager/graph/frame_node_impl.h"
namespace performance_manager {
diff --git a/components/performance_manager/graph/graph_impl.cc b/components/performance_manager/graph/graph_impl.cc
index 9f7fd5dc..260e1f96 100644
--- a/components/performance_manager/graph/graph_impl.cc
+++ b/components/performance_manager/graph/graph_impl.cc
@@ -9,10 +9,11 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#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/notreached.h"
#include "base/stl_util.h"
#include "components/performance_manager/graph/frame_node_impl.h"
#include "components/performance_manager/graph/node_base.h"
diff --git a/components/performance_manager/graph/node_attached_data.cc b/components/performance_manager/graph/node_attached_data.cc
index 98bb41aa..ba7147e 100644
--- a/components/performance_manager/graph/node_attached_data.cc
+++ b/components/performance_manager/graph/node_attached_data.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/performance_manager/graph/graph_impl.h"
#include "components/performance_manager/public/graph/node.h"
diff --git a/components/performance_manager/graph/page_node.cc b/components/performance_manager/graph/page_node.cc
index 84b44f40..772581fa 100644
--- a/components/performance_manager/graph/page_node.cc
+++ b/components/performance_manager/graph/page_node.cc
@@ -4,7 +4,6 @@
#include "components/performance_manager/public/graph/page_node.h"
-#include "base/logging.h"
#include "components/performance_manager/graph/page_node_impl.h"
namespace performance_manager {
diff --git a/components/performance_manager/graph/page_node_impl.cc b/components/performance_manager/graph/page_node_impl.cc
index 2b4bca18..b64294c 100644
--- a/components/performance_manager/graph/page_node_impl.cc
+++ b/components/performance_manager/graph/page_node_impl.cc
@@ -7,7 +7,7 @@
#include <memory>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/stl_util.h"
#include "base/time/default_tick_clock.h"
#include "components/performance_manager/graph/frame_node_impl.h"
diff --git a/components/performance_manager/graph/process_node.cc b/components/performance_manager/graph/process_node.cc
index 9ab1081..0e291e2 100644
--- a/components/performance_manager/graph/process_node.cc
+++ b/components/performance_manager/graph/process_node.cc
@@ -4,7 +4,6 @@
#include "components/performance_manager/public/graph/process_node.h"
-#include "base/logging.h"
#include "components/performance_manager/graph/process_node_impl.h"
namespace performance_manager {
diff --git a/components/performance_manager/graph/process_node_impl.cc b/components/performance_manager/graph/process_node_impl.cc
index 8bceef0..20755d9 100644
--- a/components/performance_manager/graph/process_node_impl.cc
+++ b/components/performance_manager/graph/process_node_impl.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/performance_manager/graph/frame_node_impl.h"
#include "components/performance_manager/graph/graph_impl.h"
#include "components/performance_manager/graph/page_node_impl.h"
diff --git a/components/performance_manager/graph/system_node.cc b/components/performance_manager/graph/system_node.cc
index 2ca6801..a435a43d 100644
--- a/components/performance_manager/graph/system_node.cc
+++ b/components/performance_manager/graph/system_node.cc
@@ -4,7 +4,6 @@
#include "components/performance_manager/public/graph/system_node.h"
-#include "base/logging.h"
#include "components/performance_manager/graph/system_node_impl.h"
namespace performance_manager {
diff --git a/components/performance_manager/graph/worker_node.cc b/components/performance_manager/graph/worker_node.cc
index 8778e2a..f4e7c0b7 100644
--- a/components/performance_manager/graph/worker_node.cc
+++ b/components/performance_manager/graph/worker_node.cc
@@ -4,7 +4,6 @@
#include "components/performance_manager/public/graph/worker_node.h"
-#include "base/logging.h"
#include "components/performance_manager/graph/worker_node_impl.h"
namespace performance_manager {
diff --git a/components/performance_manager/performance_manager_impl.cc b/components/performance_manager/performance_manager_impl.cc
index 051af6d..e867877 100644
--- a/components/performance_manager/performance_manager_impl.cc
+++ b/components/performance_manager/performance_manager_impl.cc
@@ -9,10 +9,11 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/containers/flat_set.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
+#include "base/notreached.h"
#include "base/task/lazy_thread_pool_task_runner.h"
#include "base/task/post_task.h"
#include "base/task/task_traits.h"
diff --git a/components/performance_manager/persistence/site_data/exponential_moving_average.cc b/components/performance_manager/persistence/site_data/exponential_moving_average.cc
index d7bdb5c..3c3aa23 100644
--- a/components/performance_manager/persistence/site_data/exponential_moving_average.cc
+++ b/components/performance_manager/persistence/site_data/exponential_moving_average.cc
@@ -6,7 +6,7 @@
#include <cmath>
-#include "base/logging.h"
+#include "base/check.h"
namespace performance_manager {
diff --git a/components/performance_manager/render_process_user_data.cc b/components/performance_manager/render_process_user_data.cc
index 72e0e4d..c00f8f5a 100644
--- a/components/performance_manager/render_process_user_data.cc
+++ b/components/performance_manager/render_process_user_data.cc
@@ -8,8 +8,8 @@
#include <utility>
#include "base/bind.h"
+#include "base/check.h"
#include "base/command_line.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#include "components/performance_manager/graph/process_node_impl.h"
diff --git a/components/performance_manager/service_worker_context_adapter.cc b/components/performance_manager/service_worker_context_adapter.cc
index 9cc389c..35c1bdf3 100644
--- a/components/performance_manager/service_worker_context_adapter.cc
+++ b/components/performance_manager/service_worker_context_adapter.cc
@@ -4,7 +4,8 @@
#include "components/performance_manager/service_worker_context_adapter.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_process_host_observer.h"
diff --git a/components/permissions/permission_request.cc b/components/permissions/permission_request.cc
index 5e402c67..7ba8098 100644
--- a/components/permissions/permission_request.cc
+++ b/components/permissions/permission_request.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "components/permissions/permission_request.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "build/build_config.h"
namespace permissions {
diff --git a/components/permissions/permission_util.cc b/components/permissions/permission_util.cc
index 97c25800..f5635ab 100644
--- a/components/permissions/permission_util.cc
+++ b/components/permissions/permission_util.cc
@@ -4,7 +4,7 @@
#include "components/permissions/permission_util.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "build/build_config.h"
#include "content/public/browser/permission_type.h"
diff --git a/components/policy/content/policy_blacklist_navigation_throttle.cc b/components/policy/content/policy_blacklist_navigation_throttle.cc
index f9a6213..9a7b34b 100644
--- a/components/policy/content/policy_blacklist_navigation_throttle.cc
+++ b/components/policy/content/policy_blacklist_navigation_throttle.cc
@@ -5,7 +5,7 @@
#include "components/policy/content/policy_blacklist_navigation_throttle.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/policy/content/policy_blacklist_service.h"
#include "components/policy/core/browser/url_blacklist_manager.h"
#include "components/policy/core/browser/url_blacklist_policy_handler.h"
diff --git a/components/policy/core/browser/android/policy_converter.cc b/components/policy/core/browser/android/policy_converter.cc
index fa51c569..036db37 100644
--- a/components/policy/core/browser/android/policy_converter.cc
+++ b/components/policy/core/browser/android/policy_converter.cc
@@ -10,8 +10,9 @@
#include "base/android/jni_android.h"
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
+#include "base/check_op.h"
#include "base/json/json_reader.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
diff --git a/components/policy/core/browser/browser_policy_connector_base.cc b/components/policy/core/browser/browser_policy_connector_base.cc
index 29718da..36e07d67 100644
--- a/components/policy/core/browser/browser_policy_connector_base.cc
+++ b/components/policy/core/browser/browser_policy_connector_base.cc
@@ -8,7 +8,7 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
+#include "base/check.h"
#include "components/policy/core/common/chrome_schema.h"
#include "components/policy/core/common/configuration_policy_provider.h"
#include "components/policy/core/common/policy_namespace.h"
diff --git a/components/policy/core/browser/cloud/message_util.cc b/components/policy/core/browser/cloud/message_util.cc
index aa9c2737..1ac6058 100644
--- a/components/policy/core/browser/cloud/message_util.cc
+++ b/components/policy/core/browser/cloud/message_util.cc
@@ -4,7 +4,7 @@
#include "components/policy/core/browser/cloud/message_util.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "components/strings/grit/components_strings.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/components/policy/core/browser/configuration_policy_handler.cc b/components/policy/core/browser/configuration_policy_handler.cc
index 1dfd112..b825d2d5 100644
--- a/components/policy/core/browser/configuration_policy_handler.cc
+++ b/components/policy/core/browser/configuration_policy_handler.cc
@@ -10,12 +10,13 @@
#include <utility>
#include "base/callback.h"
+#include "base/check.h"
#include "base/files/file_path.h"
#include "base/json/json_reader.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/metrics/histogram.h"
#include "base/metrics/histogram_functions.h"
+#include "base/notreached.h"
#include "base/numerics/ranges.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
diff --git a/components/policy/core/browser/configuration_policy_handler_unittest.cc b/components/policy/core/browser/configuration_policy_handler_unittest.cc
index 3849a735..a09aa766 100644
--- a/components/policy/core/browser/configuration_policy_handler_unittest.cc
+++ b/components/policy/core/browser/configuration_policy_handler_unittest.cc
@@ -8,8 +8,8 @@
#include "base/bind.h"
#include "base/callback.h"
+#include "base/check.h"
#include "base/json/json_reader.h"
-#include "base/logging.h"
#include "base/values.h"
#include "components/policy/core/browser/policy_error_map.h"
#include "components/policy/core/common/policy_map.h"
diff --git a/components/policy/core/browser/policy_conversions.cc b/components/policy/core/browser/policy_conversions.cc
index cfef134a..3a6d415 100644
--- a/components/policy/core/browser/policy_conversions.cc
+++ b/components/policy/core/browser/policy_conversions.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "components/policy/core/browser/policy_conversions_client.h"
#include "components/strings/grit/components_strings.h"
#include "extensions/buildflags/buildflags.h"
diff --git a/components/policy/core/browser/proxy_policy_handler.cc b/components/policy/core/browser/proxy_policy_handler.cc
index db4e18a..c6437358 100644
--- a/components/policy/core/browser/proxy_policy_handler.cc
+++ b/components/policy/core/browser/proxy_policy_handler.cc
@@ -6,7 +6,8 @@
#include <stddef.h>
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
diff --git a/components/policy/core/browser/url_blacklist_manager.cc b/components/policy/core/browser/url_blacklist_manager.cc
index c189e26..c9ec673f 100644
--- a/components/policy/core/browser/url_blacklist_manager.cc
+++ b/components/policy/core/browser/url_blacklist_manager.cc
@@ -13,9 +13,9 @@
#include <vector>
#include "base/bind.h"
+#include "base/check.h"
#include "base/files/file_path.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/sequenced_task_runner.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
diff --git a/components/policy/core/common/cloud/cloud_policy_constants.cc b/components/policy/core/common/cloud/cloud_policy_constants.cc
index 221d990..ad79d4d9 100644
--- a/components/policy/core/common/cloud/cloud_policy_constants.cc
+++ b/components/policy/core/common/cloud/cloud_policy_constants.cc
@@ -7,7 +7,6 @@
#include <stdint.h>
#include "base/command_line.h"
-#include "base/logging.h"
#include "build/build_config.h"
#include "components/policy/core/common/policy_switches.h"
diff --git a/components/policy/core/common/cloud/cloud_policy_core.cc b/components/policy/core/common/cloud/cloud_policy_core.cc
index 16fb4695b..72c19d6 100644
--- a/components/policy/core/common/cloud/cloud_policy_core.cc
+++ b/components/policy/core/common/cloud/cloud_policy_core.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/policy/core/common/cloud/cloud_policy_client.h"
#include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
#include "components/policy/core/common/cloud/cloud_policy_service.h"
diff --git a/components/policy/core/common/cloud/cloud_policy_manager.cc b/components/policy/core/common/cloud/cloud_policy_manager.cc
index 6f7a5fa..f39a79d 100644
--- a/components/policy/core/common/cloud/cloud_policy_manager.cc
+++ b/components/policy/core/common/cloud/cloud_policy_manager.cc
@@ -8,9 +8,9 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check_op.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
-#include "base/logging.h"
#include "base/optional.h"
#include "base/task/post_task.h"
#include "base/task/task_traits.h"
diff --git a/components/policy/core/common/cloud/cloud_policy_store.cc b/components/policy/core/common/cloud/cloud_policy_store.cc
index a0d9c84..51bcd62 100644
--- a/components/policy/core/common/cloud/cloud_policy_store.cc
+++ b/components/policy/core/common/cloud/cloud_policy_store.cc
@@ -4,7 +4,7 @@
#include "components/policy/core/common/cloud/cloud_policy_store.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/policy/core/common/cloud/cloud_external_data_manager.h"
#include "components/policy/proto/device_management_backend.pb.h"
diff --git a/components/policy/core/common/cloud/cloud_policy_util.cc b/components/policy/core/common/cloud/cloud_policy_util.cc
index 2c0e0e3..fc9f47c 100644
--- a/components/policy/core/common/cloud/cloud_policy_util.cc
+++ b/components/policy/core/common/cloud/cloud_policy_util.cc
@@ -37,7 +37,8 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/system/sys_info.h"
#include "components/version_info/version_info.h"
diff --git a/components/policy/core/common/cloud/external_policy_data_fetcher.cc b/components/policy/core/common/cloud/external_policy_data_fetcher.cc
index 10757f6..09e15039 100644
--- a/components/policy/core/common/cloud/external_policy_data_fetcher.cc
+++ b/components/policy/core/common/cloud/external_policy_data_fetcher.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/macros.h"
#include "base/sequenced_task_runner.h"
#include "base/stl_util.h"
diff --git a/components/policy/core/common/plist_writer.cc b/components/policy/core/common/plist_writer.cc
index 29773e13..9de83e3dd 100644
--- a/components/policy/core/common/plist_writer.cc
+++ b/components/policy/core/common/plist_writer.cc
@@ -4,7 +4,8 @@
#include "components/policy/core/common/plist_writer.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "build/build_config.h"
#include "third_party/libxml/chromium/xml_writer.h"
diff --git a/components/policy/core/common/policy_bundle.cc b/components/policy/core/common/policy_bundle.cc
index 9fa45114..4c4600172 100644
--- a/components/policy/core/common/policy_bundle.cc
+++ b/components/policy/core/common/policy_bundle.cc
@@ -4,7 +4,8 @@
#include "components/policy/core/common/policy_bundle.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
namespace policy {
diff --git a/components/policy/core/common/policy_statistics_collector.cc b/components/policy/core/common/policy_statistics_collector.cc
index a4e50c4..d99c4d5 100644
--- a/components/policy/core/common/policy_statistics_collector.cc
+++ b/components/policy/core/common/policy_statistics_collector.cc
@@ -10,8 +10,8 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
+#include "base/notreached.h"
#include "base/task_runner.h"
#include "components/policy/core/common/policy_pref_names.h"
#include "components/policy/core/common/policy_service.h"
diff --git a/components/policy/core/common/preg_parser_unittest.cc b/components/policy/core/common/preg_parser_unittest.cc
index 43d84c268..98b299e 100644
--- a/components/policy/core/common/preg_parser_unittest.cc
+++ b/components/policy/core/common/preg_parser_unittest.cc
@@ -10,7 +10,6 @@
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/json/json_writer.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/path_service.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/policy/core/common/proxy_policy_provider.cc b/components/policy/core/common/proxy_policy_provider.cc
index 27cb981..6d6072f 100644
--- a/components/policy/core/common/proxy_policy_provider.cc
+++ b/components/policy/core/common/proxy_policy_provider.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/policy/core/common/policy_bundle.h"
namespace policy {
diff --git a/components/policy/core/common/remote_commands/remote_commands_queue.cc b/components/policy/core/common/remote_commands/remote_commands_queue.cc
index c53e173..c18d37a 100644
--- a/components/policy/core/common/remote_commands/remote_commands_queue.cc
+++ b/components/policy/core/common/remote_commands/remote_commands_queue.cc
@@ -8,8 +8,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/time/clock.h"
#include "base/time/default_clock.h"
#include "base/time/default_tick_clock.h"
diff --git a/components/policy/core/common/remote_commands/test_remote_command_job.cc b/components/policy/core/common/remote_commands/test_remote_command_job.cc
index aaf05603..6969b25 100644
--- a/components/policy/core/common/remote_commands/test_remote_command_job.cc
+++ b/components/policy/core/common/remote_commands/test_remote_command_job.cc
@@ -9,8 +9,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/macros.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/components/policy/core/common/remote_commands/testing_remote_commands_server.cc b/components/policy/core/common/remote_commands/testing_remote_commands_server.cc
index 36b2095..845172b 100644
--- a/components/policy/core/common/remote_commands/testing_remote_commands_server.cc
+++ b/components/policy/core/common/remote_commands/testing_remote_commands_server.cc
@@ -9,9 +9,9 @@
#include "base/bind.h"
#include "base/callback.h"
+#include "base/check.h"
#include "base/hash/sha1.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/optional.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/components/policy/core/common/schema.cc b/components/policy/core/common/schema.cc
index 49ad203..ef176bb 100644
--- a/components/policy/core/common/schema.cc
+++ b/components/policy/core/common/schema.cc
@@ -13,12 +13,13 @@
#include <memory>
#include <utility>
+#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/containers/flat_set.h"
#include "base/json/json_reader.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "components/policy/core/common/json_schema_constants.h"
diff --git a/components/policy/core/common/schema_registry.cc b/components/policy/core/common/schema_registry.cc
index 25b3223..ccd85bc 100644
--- a/components/policy/core/common/schema_registry.cc
+++ b/components/policy/core/common/schema_registry.cc
@@ -4,7 +4,8 @@
#include "components/policy/core/common/schema_registry.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "extensions/buildflags/buildflags.h"
namespace policy {
diff --git a/components/prefs/default_pref_store.cc b/components/prefs/default_pref_store.cc
index d8d13ec0..d54302e 100644
--- a/components/prefs/default_pref_store.cc
+++ b/components/prefs/default_pref_store.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
using base::Value;
diff --git a/components/prefs/pref_change_registrar.cc b/components/prefs/pref_change_registrar.cc
index 0db9284..97e59165 100644
--- a/components/prefs/pref_change_registrar.cc
+++ b/components/prefs/pref_change_registrar.cc
@@ -5,7 +5,8 @@
#include "components/prefs/pref_change_registrar.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "components/prefs/pref_service.h"
PrefChangeRegistrar::PrefChangeRegistrar() : service_(nullptr) {}
diff --git a/components/prefs/pref_registry.cc b/components/prefs/pref_registry.cc
index 6c6aab7..f8c68f3 100644
--- a/components/prefs/pref_registry.cc
+++ b/components/prefs/pref_registry.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/stl_util.h"
#include "base/values.h"
#include "components/prefs/default_pref_store.h"
diff --git a/components/prefs/pref_service.cc b/components/prefs/pref_service.cc
index e848c9f..ba16dd4 100644
--- a/components/prefs/pref_service.cc
+++ b/components/prefs/pref_service.cc
@@ -9,13 +9,14 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/debug/alias.h"
#include "base/debug/dump_without_crashing.h"
#include "base/files/file_path.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram.h"
+#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/components/prefs/pref_value_map.cc b/components/prefs/pref_value_map.cc
index 8a203ac..a7a9c73 100644
--- a/components/prefs/pref_value_map.cc
+++ b/components/prefs/pref_value_map.cc
@@ -8,7 +8,6 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
#include "base/values.h"
PrefValueMap::PrefValueMap() {}
diff --git a/components/prefs/scoped_user_pref_update.cc b/components/prefs/scoped_user_pref_update.cc
index 27d56af..eb86b5ea 100644
--- a/components/prefs/scoped_user_pref_update.cc
+++ b/components/prefs/scoped_user_pref_update.cc
@@ -4,7 +4,7 @@
#include "components/prefs/scoped_user_pref_update.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/prefs/pref_notifier.h"
#include "components/prefs/pref_service.h"
diff --git a/components/previews/core/previews_black_list.cc b/components/previews/core/previews_black_list.cc
index d7d99fe..93cdaba 100644
--- a/components/previews/core/previews_black_list.cc
+++ b/components/previews/core/previews_black_list.cc
@@ -5,10 +5,11 @@
#include "components/previews/core/previews_black_list.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/optional.h"
#include "base/strings/stringprintf.h"
#include "base/time/clock.h"
diff --git a/components/previews/core/previews_lite_page_redirect.cc b/components/previews/core/previews_lite_page_redirect.cc
index e02aea65..5fc9746 100644
--- a/components/previews/core/previews_lite_page_redirect.cc
+++ b/components/previews/core/previews_lite_page_redirect.cc
@@ -4,7 +4,7 @@
#include "components/previews/core/previews_lite_page_redirect.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "components/previews/core/previews_experiments.h"
#include "net/base/url_util.h"
diff --git a/components/printing/common/cloud_print_cdd_conversion.cc b/components/printing/common/cloud_print_cdd_conversion.cc
index 62b6e07..550efee 100644
--- a/components/printing/common/cloud_print_cdd_conversion.cc
+++ b/components/printing/common/cloud_print_cdd_conversion.cc
@@ -9,8 +9,9 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/ptr_util.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "components/cloud_devices/common/printer_description.h"
#include "printing/backend/print_backend.h"
diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/proxy_config/proxy_config_dictionary.cc
index b5304be..f428939f 100644
--- a/components/proxy_config/proxy_config_dictionary.cc
+++ b/components/proxy_config/proxy_config_dictionary.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "net/proxy_resolution/proxy_config.h"
namespace {
diff --git a/components/proxy_config/proxy_prefs.cc b/components/proxy_config/proxy_prefs.cc
index 30eef91e..db6c6d6 100644
--- a/components/proxy_config/proxy_prefs.cc
+++ b/components/proxy_config/proxy_prefs.cc
@@ -4,7 +4,8 @@
#include "components/proxy_config/proxy_prefs.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
namespace ProxyPrefs {
diff --git a/components/pwg_encoder/bitmap_image.cc b/components/pwg_encoder/bitmap_image.cc
index 2e302bb8..e6d24e0 100644
--- a/components/pwg_encoder/bitmap_image.cc
+++ b/components/pwg_encoder/bitmap_image.cc
@@ -4,7 +4,7 @@
#include "components/pwg_encoder/bitmap_image.h"
-#include "base/logging.h"
+#include "base/check_op.h"
namespace pwg_encoder {
diff --git a/components/query_parser/query_parser.cc b/components/query_parser/query_parser.cc
index 99ff108..a84d543a 100644
--- a/components/query_parser/query_parser.cc
+++ b/components/query_parser/query_parser.cc
@@ -7,11 +7,12 @@
#include <algorithm>
#include <memory>
+#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/i18n/break_iterator.h"
#include "base/i18n/case_conversion.h"
-#include "base/logging.h"
#include "base/macros.h"
+#include "base/notreached.h"
#include "base/strings/utf_string_conversions.h"
namespace query_parser {
diff --git a/components/query_parser/snippet.cc b/components/query_parser/snippet.cc
index c702b23..4535bae8 100644
--- a/components/query_parser/snippet.cc
+++ b/components/query_parser/snippet.cc
@@ -9,7 +9,7 @@
#include <algorithm>
#include <memory>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/rappor/bloom_filter.cc b/components/rappor/bloom_filter.cc
index f5dc3ed..66f8bece 100644
--- a/components/rappor/bloom_filter.cc
+++ b/components/rappor/bloom_filter.cc
@@ -6,9 +6,9 @@
#include <stddef.h>
+#include "base/check_op.h"
#include "base/containers/span.h"
#include "base/hash/legacy_hash.h"
-#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
namespace rappor {
diff --git a/components/rappor/byte_vector_utils.cc b/components/rappor/byte_vector_utils.cc
index a61f474..d229719 100644
--- a/components/rappor/byte_vector_utils.cc
+++ b/components/rappor/byte_vector_utils.cc
@@ -8,7 +8,8 @@
#include <algorithm>
#include <string>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/rand_util.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
diff --git a/components/rappor/rappor_metric.cc b/components/rappor/rappor_metric.cc
index ecc6ae3..7a82d69 100644
--- a/components/rappor/rappor_metric.cc
+++ b/components/rappor/rappor_metric.cc
@@ -4,7 +4,7 @@
#include "components/rappor/rappor_metric.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/rand_util.h"
#include "components/rappor/public/rappor_parameters.h"
#include "components/rappor/reports.h"
diff --git a/components/rappor/reports.cc b/components/rappor/reports.cc
index b035b5b5..550b5cd 100644
--- a/components/rappor/reports.cc
+++ b/components/rappor/reports.cc
@@ -4,7 +4,6 @@
#include "components/rappor/reports.h"
-#include "base/logging.h"
#include "base/rand_util.h"
#include "base/strings/string_piece.h"
#include "components/rappor/byte_vector_utils.h"
diff --git a/components/rappor/test_rappor_service.cc b/components/rappor/test_rappor_service.cc
index 76b5525..44a3e87 100644
--- a/components/rappor/test_rappor_service.cc
+++ b/components/rappor/test_rappor_service.cc
@@ -7,7 +7,6 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "components/rappor/byte_vector_utils.h"
#include "components/rappor/proto/rappor_metric.pb.h"
diff --git a/components/reading_list/core/offline_url_utils.cc b/components/reading_list/core/offline_url_utils.cc
index 65d6b03..c8c0893 100644
--- a/components/reading_list/core/offline_url_utils.cc
+++ b/components/reading_list/core/offline_url_utils.cc
@@ -5,7 +5,7 @@
#include "components/reading_list/core/offline_url_utils.h"
#include "base/hash/md5.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/stringprintf.h"
namespace {
diff --git a/components/reading_list/core/reading_list_model.cc b/components/reading_list/core/reading_list_model.cc
index 577c8a6..d598099 100644
--- a/components/reading_list/core/reading_list_model.cc
+++ b/components/reading_list/core/reading_list_model.cc
@@ -4,7 +4,7 @@
#include "components/reading_list/core/reading_list_model.h"
-#include "base/logging.h"
+#include "base/check_op.h"
ReadingListModel::ReadingListModel() : current_batch_updates_count_(0) {}
diff --git a/components/reading_list/core/reading_list_model_impl.cc b/components/reading_list/core/reading_list_model_impl.cc
index ec0f84a3..e40927a1 100644
--- a/components/reading_list/core/reading_list_model_impl.cc
+++ b/components/reading_list/core/reading_list_model_impl.cc
@@ -5,7 +5,7 @@
#include "components/reading_list/core/reading_list_model_impl.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/string_util.h"
#include "base/time/clock.h"
#include "components/prefs/pref_service.h"
diff --git a/components/reading_list/core/reading_list_store.cc b/components/reading_list/core/reading_list_store.cc
index e66403a0..20a9cd93 100644
--- a/components/reading_list/core/reading_list_store.cc
+++ b/components/reading_list/core/reading_list_store.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/time/clock.h"
#include "components/reading_list/core/proto/reading_list.pb.h"
#include "components/reading_list/core/reading_list_model_impl.h"
diff --git a/components/safe_browsing/android/remote_database_manager_unittest.cc b/components/safe_browsing/android/remote_database_manager_unittest.cc
index 5a8f7c1..b8ada0c1 100644
--- a/components/safe_browsing/android/remote_database_manager_unittest.cc
+++ b/components/safe_browsing/android/remote_database_manager_unittest.cc
@@ -7,7 +7,6 @@
#include <map>
#include <memory>
-#include "base/logging.h"
#include "base/metrics/field_trial.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
diff --git a/components/safe_browsing/content/browser/browser_url_loader_throttle.cc b/components/safe_browsing/content/browser/browser_url_loader_throttle.cc
index 3bf8e498..b149e20 100644
--- a/components/safe_browsing/content/browser/browser_url_loader_throttle.cc
+++ b/components/safe_browsing/content/browser/browser_url_loader_throttle.cc
@@ -5,7 +5,7 @@
#include "components/safe_browsing/content/browser/browser_url_loader_throttle.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ptr_util.h"
#include "base/trace_event/trace_event.h"
#include "components/safe_browsing/core/browser/safe_browsing_url_checker_impl.h"
diff --git a/components/safe_browsing/content/password_protection/visual_utils.cc b/components/safe_browsing/content/password_protection/visual_utils.cc
index 26a0863..8534979 100644
--- a/components/safe_browsing/content/password_protection/visual_utils.cc
+++ b/components/safe_browsing/content/password_protection/visual_utils.cc
@@ -7,7 +7,6 @@
#include "components/safe_browsing/content/password_protection/visual_utils.h"
-#include "base/logging.h"
#include "base/numerics/checked_math.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkPixmap.h"
diff --git a/components/safe_browsing/content/renderer/renderer_url_loader_throttle.cc b/components/safe_browsing/content/renderer/renderer_url_loader_throttle.cc
index 3cc8585..527a299 100644
--- a/components/safe_browsing/content/renderer/renderer_url_loader_throttle.cc
+++ b/components/safe_browsing/content/renderer/renderer_url_loader_throttle.cc
@@ -5,7 +5,7 @@
#include "components/safe_browsing/content/renderer/renderer_url_loader_throttle.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/trace_event/trace_event.h"
#include "components/safe_browsing/core/common/safebrowsing_constants.h"
#include "components/safe_browsing/core/common/utils.h"
diff --git a/components/safe_browsing/content/renderer/websocket_sb_handshake_throttle.cc b/components/safe_browsing/content/renderer/websocket_sb_handshake_throttle.cc
index 9f7061b..4b92b8f 100644
--- a/components/safe_browsing/content/renderer/websocket_sb_handshake_throttle.cc
+++ b/components/safe_browsing/content/renderer/websocket_sb_handshake_throttle.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/metrics/histogram_macros.h"
#include "base/strings/stringprintf.h"
#include "content/public/renderer/render_frame.h"
diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
index dda2451..b6a360d 100644
--- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
+++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
@@ -4,9 +4,10 @@
#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+#include "base/check_op.h"
#include "base/command_line.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
diff --git a/components/safe_browsing/core/db/test_database_manager.cc b/components/safe_browsing/core/db/test_database_manager.cc
index 4de62a7..736bdcf2 100644
--- a/components/safe_browsing/core/db/test_database_manager.cc
+++ b/components/safe_browsing/core/db/test_database_manager.cc
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/logging.h"
+#include "base/notreached.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
namespace safe_browsing {
diff --git a/components/safe_browsing/core/db/v4_embedded_test_server_util.cc b/components/safe_browsing/core/db/v4_embedded_test_server_util.cc
index 348c3b38..ceb0c9a 100644
--- a/components/safe_browsing/core/db/v4_embedded_test_server_util.cc
+++ b/components/safe_browsing/core/db/v4_embedded_test_server_util.cc
@@ -11,7 +11,7 @@
#include "base/base64.h"
#include "base/base64url.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/safe_browsing/core/db/util.h"
#include "components/safe_browsing/core/db/v4_test_util.h"
#include "net/base/url_util.h"
diff --git a/components/safe_browsing/core/db/v4_rice.cc b/components/safe_browsing/core/db/v4_rice.cc
index ebc31055..7a837fd 100644
--- a/components/safe_browsing/core/db/v4_rice.cc
+++ b/components/safe_browsing/core/db/v4_rice.cc
@@ -5,7 +5,8 @@
#include <algorithm>
#include <vector>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/numerics/safe_math.h"
#include "base/strings/stringprintf.h"
#include "build/build_config.h"
diff --git a/components/safe_browsing/core/file_type_policies.cc b/components/safe_browsing/core/file_type_policies.cc
index 84f77d9..30df9b4 100644
--- a/components/safe_browsing/core/file_type_policies.cc
+++ b/components/safe_browsing/core/file_type_policies.cc
@@ -4,7 +4,7 @@
#include "components/safe_browsing/core/file_type_policies.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/singleton.h"
#include "base/metrics/histogram_functions.h"
#include "base/strings/string_util.h"
diff --git a/components/safe_browsing/core/ping_manager.cc b/components/safe_browsing/core/ping_manager.cc
index 3f2cde6..c2e6100 100644
--- a/components/safe_browsing/core/ping_manager.cc
+++ b/components/safe_browsing/core/ping_manager.cc
@@ -7,8 +7,9 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/ptr_util.h"
+#include "base/notreached.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "components/safe_browsing/core/db/v4_protocol_manager_util.h"
diff --git a/components/safe_browsing/core/ping_manager_unittest.cc b/components/safe_browsing/core/ping_manager_unittest.cc
index ed2d135..062b119c 100644
--- a/components/safe_browsing/core/ping_manager_unittest.cc
+++ b/components/safe_browsing/core/ping_manager_unittest.cc
@@ -5,7 +5,6 @@
#include "components/safe_browsing/core/ping_manager.h"
#include "base/base64.h"
-#include "base/logging.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc
index df1a6d35..aff01d37 100644
--- a/components/search_engines/default_search_manager.cc
+++ b/components/search_engines/default_search_manager.cc
@@ -12,9 +12,9 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/i18n/case_conversion.h"
-#include "base/logging.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/search_engines/search_terms_data.cc b/components/search_engines/search_terms_data.cc
index 441fb9e1..830f47f 100644
--- a/components/search_engines/search_terms_data.cc
+++ b/components/search_engines/search_terms_data.cc
@@ -4,7 +4,7 @@
#include "components/search_engines/search_terms_data.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/google/core/common/google_util.h"
#include "url/gurl.h"
diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
index 39968b30..74e2ce9 100644
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -8,13 +8,14 @@
#include <vector>
#include "base/base64.h"
+#include "base/check_op.h"
#include "base/command_line.h"
#include "base/format_macros.h"
#include "base/i18n/case_conversion.h"
#include "base/i18n/icu_string_conversions.h"
#include "base/i18n/rtl.h"
-#include "base/logging.h"
#include "base/metrics/field_trial.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/components/search_engines/template_url_data.cc b/components/search_engines/template_url_data.cc
index 6a9635ec..d0523d8 100644
--- a/components/search_engines/template_url_data.cc
+++ b/components/search_engines/template_url_data.cc
@@ -4,9 +4,9 @@
#include "components/search_engines/template_url_data.h"
+#include "base/check.h"
#include "base/guid.h"
#include "base/i18n/case_conversion.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/components/search_engines/util.cc b/components/search_engines/util.cc
index 9f73ffe..048f090 100644
--- a/components/search_engines/util.cc
+++ b/components/search_engines/util.cc
@@ -15,7 +15,7 @@
#include <unordered_map>
#include <vector>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/time/time.h"
#include "components/prefs/pref_service.h"
#include "components/search_engines/template_url.h"
diff --git a/components/security_interstitials/content/captive_portal_helper_android.cc b/components/security_interstitials/content/captive_portal_helper_android.cc
index 49e124c3..5095d5e4 100644
--- a/components/security_interstitials/content/captive_portal_helper_android.cc
+++ b/components/security_interstitials/content/captive_portal_helper_android.cc
@@ -13,7 +13,6 @@
#include "base/android/jni_string.h"
#include "base/bind.h"
-#include "base/logging.h"
#include "base/threading/thread_task_runner_handle.h"
#include "components/security_interstitials/content/android/jni_headers/CaptivePortalHelper_jni.h"
#include "components/security_interstitials/content/ssl_error_assistant.h"
diff --git a/components/security_interstitials/content/common_name_mismatch_handler.cc b/components/security_interstitials/content/common_name_mismatch_handler.cc
index 0dddbc5..97a2b8b7 100644
--- a/components/security_interstitials/content/common_name_mismatch_handler.cc
+++ b/components/security_interstitials/content/common_name_mismatch_handler.cc
@@ -7,7 +7,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/string_number_conversions.h"
#include "components/ssl_errors/error_classification.h"
#include "net/base/load_flags.h"
diff --git a/components/security_interstitials/content/origin_policy_ui.cc b/components/security_interstitials/content/origin_policy_ui.cc
index 3f9efea..6ce9f904 100644
--- a/components/security_interstitials/content/origin_policy_ui.cc
+++ b/components/security_interstitials/content/origin_policy_ui.cc
@@ -7,7 +7,7 @@
#include <string>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/optional.h"
#include "components/security_interstitials/content/origin_policy_interstitial_page.h"
#include "components/security_interstitials/content/security_interstitial_tab_helper.h"
diff --git a/components/send_tab_to_self/send_tab_to_self_bridge.cc b/components/send_tab_to_self/send_tab_to_self_bridge.cc
index c20ea0b..8cea640 100644
--- a/components/send_tab_to_self/send_tab_to_self_bridge.cc
+++ b/components/send_tab_to_self/send_tab_to_self_bridge.cc
@@ -8,8 +8,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check_op.h"
#include "base/guid.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/optional.h"
diff --git a/components/send_tab_to_self/send_tab_to_self_entry.cc b/components/send_tab_to_self/send_tab_to_self_entry.cc
index b7979a9..8521faf 100644
--- a/components/send_tab_to_self/send_tab_to_self_entry.cc
+++ b/components/send_tab_to_self/send_tab_to_self_entry.cc
@@ -6,8 +6,8 @@
#include <memory>
+#include "base/check.h"
#include "base/guid.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "components/send_tab_to_self/proto/send_tab_to_self.pb.h"
diff --git a/components/services/filesystem/directory_impl.cc b/components/services/filesystem/directory_impl.cc
index 1e01d4159..d934ad2 100644
--- a/components/services/filesystem/directory_impl.cc
+++ b/components/services/filesystem/directory_impl.cc
@@ -13,7 +13,6 @@
#include "base/files/file_enumerator.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/logging.h"
#include "build/build_config.h"
#include "components/services/filesystem/file_impl.h"
#include "components/services/filesystem/lock_table.h"
diff --git a/components/services/filesystem/file_impl.cc b/components/services/filesystem/file_impl.cc
index 2d9f9b0..dd65d6d1 100644
--- a/components/services/filesystem/file_impl.cc
+++ b/components/services/filesystem/file_impl.cc
@@ -12,9 +12,9 @@
#include <utility>
#include <vector>
+#include "base/check_op.h"
#include "base/files/file_path.h"
#include "base/files/scoped_file.h"
-#include "base/logging.h"
#include "build/build_config.h"
#include "components/services/filesystem/lock_table.h"
#include "components/services/filesystem/shared_temp_dir.h"
diff --git a/components/services/filesystem/util.cc b/components/services/filesystem/util.cc
index 7ed11a2..3ceef6c 100644
--- a/components/services/filesystem/util.cc
+++ b/components/services/filesystem/util.cc
@@ -12,7 +12,6 @@
#include <limits>
#include <string>
-#include "base/logging.h"
#include "base/strings/string_util.h"
#include "build/build_config.h"
diff --git a/components/services/heap_profiling/heap_profiling_service.cc b/components/services/heap_profiling/heap_profiling_service.cc
index 24926a5..4763ea62 100644
--- a/components/services/heap_profiling/heap_profiling_service.cc
+++ b/components/services/heap_profiling/heap_profiling_service.cc
@@ -8,7 +8,6 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
#include "base/memory/weak_ptr.h"
#include "base/no_destructor.h"
#include "base/task/post_task.h"
diff --git a/components/services/quarantine/quarantine_win.cc b/components/services/quarantine/quarantine_win.cc
index a81c9b0e..c1eb155 100644
--- a/components/services/quarantine/quarantine_win.cc
+++ b/components/services/quarantine/quarantine_win.cc
@@ -16,10 +16,10 @@
#include <vector>
+#include "base/check_op.h"
#include "base/feature_list.h"
#include "base/files/file_util.h"
#include "base/guid.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
diff --git a/components/services/quarantine/test_support_win.cc b/components/services/quarantine/test_support_win.cc
index 18ff19a..755276e 100644
--- a/components/services/quarantine/test_support_win.cc
+++ b/components/services/quarantine/test_support_win.cc
@@ -8,7 +8,6 @@
#include <vector>
#include "base/files/file_path.h"
-#include "base/logging.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
#include "base/win/scoped_handle.h"
diff --git a/components/services/storage/dom_storage/session_storage_area_impl.cc b/components/services/storage/dom_storage/session_storage_area_impl.cc
index c3b7908..527c77f 100644
--- a/components/services/storage/dom_storage/session_storage_area_impl.cc
+++ b/components/services/storage/dom_storage/session_storage_area_impl.cc
@@ -5,7 +5,7 @@
#include "components/services/storage/dom_storage/session_storage_area_impl.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "components/services/storage/dom_storage/session_storage_data_map.h"
diff --git a/components/services/storage/indexed_db/scopes/varint_coding.cc b/components/services/storage/indexed_db/scopes/varint_coding.cc
index 0ae7522a..95ec469 100644
--- a/components/services/storage/indexed_db/scopes/varint_coding.cc
+++ b/components/services/storage/indexed_db/scopes/varint_coding.cc
@@ -4,7 +4,7 @@
#include "components/services/storage/indexed_db/scopes/varint_coding.h"
-#include "base/logging.h"
+#include "base/check_op.h"
namespace content {
diff --git a/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_database.cc b/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_database.cc
index 17937c9..edbc92b 100644
--- a/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_database.cc
+++ b/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_database.cc
@@ -12,9 +12,9 @@
#include <memory>
#include <utility>
+#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/files/file.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
diff --git a/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_transaction.cc b/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_transaction.cc
index 1448903..c8ba232 100644
--- a/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_transaction.cc
+++ b/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_transaction.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ptr_util.h"
#include "base/trace_event/trace_event.h"
#include "components/services/storage/indexed_db/scopes/leveldb_scope.h"
diff --git a/components/services/storage/public/cpp/filesystem/filesystem_impl.cc b/components/services/storage/public/cpp/filesystem/filesystem_impl.cc
index cd9b863f..4ed19bd 100644
--- a/components/services/storage/public/cpp/filesystem/filesystem_impl.cc
+++ b/components/services/storage/public/cpp/filesystem/filesystem_impl.cc
@@ -7,11 +7,12 @@
#include <set>
#include <vector>
+#include "base/check.h"
#include "base/files/file.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_util.h"
-#include "base/logging.h"
#include "base/no_destructor.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/synchronization/lock.h"
#include "build/build_config.h"
diff --git a/components/services/storage/public/cpp/filesystem/filesystem_proxy_unittest.cc b/components/services/storage/public/cpp/filesystem/filesystem_proxy_unittest.cc
index 5278743..0c88014e 100644
--- a/components/services/storage/public/cpp/filesystem/filesystem_proxy_unittest.cc
+++ b/components/services/storage/public/cpp/filesystem/filesystem_proxy_unittest.cc
@@ -6,9 +6,9 @@
#include <memory>
+#include "base/check.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/logging.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/task/post_task.h"
diff --git a/components/sessions/content/content_serialized_navigation_builder.cc b/components/sessions/content/content_serialized_navigation_builder.cc
index 90372b6..fbffe0dd 100644
--- a/components/sessions/content/content_serialized_navigation_builder.cc
+++ b/components/sessions/content/content_serialized_navigation_builder.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/sessions/content/content_record_password_state.h"
#include "components/sessions/content/content_serialized_navigation_driver.h"
#include "components/sessions/content/extended_info_handler.h"
diff --git a/components/sessions/core/tab_restore_service_helper.cc b/components/sessions/core/tab_restore_service_helper.cc
index 3caebfcd..54ff911 100644
--- a/components/sessions/core/tab_restore_service_helper.cc
+++ b/components/sessions/core/tab_restore_service_helper.cc
@@ -13,9 +13,10 @@
#include <string>
#include <utility>
+#include "base/check_op.h"
#include "base/containers/flat_set.h"
-#include "base/logging.h"
#include "base/metrics/histogram.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/components/sessions/core/tab_restore_service_impl.cc b/components/sessions/core/tab_restore_service_impl.cc
index a0a62a6..81b59449 100644
--- a/components/sessions/core/tab_restore_service_impl.cc
+++ b/components/sessions/core/tab_restore_service_impl.cc
@@ -11,12 +11,13 @@
#include <vector>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/time/time.h"
#include "components/history/core/common/pref_names.h"
diff --git a/components/signin/core/browser/account_investigator.cc b/components/signin/core/browser/account_investigator.cc
index 86cce57..3ba4a1e 100644
--- a/components/signin/core/browser/account_investigator.cc
+++ b/components/signin/core/browser/account_investigator.cc
@@ -9,7 +9,6 @@
#include "base/base64.h"
#include "base/hash/sha1.h"
-#include "base/logging.h"
#include "base/time/time.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
diff --git a/components/signin/core/browser/signin_internals_util.cc b/components/signin/core/browser/signin_internals_util.cc
index 68dc2ee..f9b98bb 100644
--- a/components/signin/core/browser/signin_internals_util.cc
+++ b/components/signin/core/browser/signin_internals_util.cc
@@ -6,7 +6,7 @@
#include <sstream>
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/signin/core/browser/signin_investigator.cc b/components/signin/core/browser/signin_investigator.cc
index 3c77124..82fa9cf0 100644
--- a/components/signin/core/browser/signin_investigator.cc
+++ b/components/signin/core/browser/signin_investigator.cc
@@ -4,7 +4,7 @@
#include "components/signin/core/browser/signin_investigator.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/metrics/histogram_macros.h"
#include "components/signin/public/base/signin_metrics.h"
#include "components/signin/public/base/signin_pref_names.h"
diff --git a/components/signin/core/browser/signin_status_metrics_provider_delegate.cc b/components/signin/core/browser/signin_status_metrics_provider_delegate.cc
index be0111a..cf31124f 100644
--- a/components/signin/core/browser/signin_status_metrics_provider_delegate.cc
+++ b/components/signin/core/browser/signin_status_metrics_provider_delegate.cc
@@ -4,7 +4,7 @@
#include "components/signin/core/browser/signin_status_metrics_provider_delegate.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/signin/core/browser/signin_status_metrics_provider.h"
AccountsStatus::AccountsStatus()
diff --git a/components/signin/internal/identity_manager/device_accounts_synchronizer_impl.cc b/components/signin/internal/identity_manager/device_accounts_synchronizer_impl.cc
index 27ab6ece..a8b5952 100644
--- a/components/signin/internal/identity_manager/device_accounts_synchronizer_impl.cc
+++ b/components/signin/internal/identity_manager/device_accounts_synchronizer_impl.cc
@@ -4,7 +4,7 @@
#include "components/signin/internal/identity_manager/device_accounts_synchronizer_impl.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/signin/internal/identity_manager/profile_oauth2_token_service_delegate.h"
namespace signin {
diff --git a/components/signin/internal/identity_manager/primary_account_mutator_impl.cc b/components/signin/internal/identity_manager/primary_account_mutator_impl.cc
index 2e762ae..aff12ef6 100644
--- a/components/signin/internal/identity_manager/primary_account_mutator_impl.cc
+++ b/components/signin/internal/identity_manager/primary_account_mutator_impl.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/logging.h"
+#include "base/check.h"
#include "components/prefs/pref_service.h"
#include "components/signin/internal/identity_manager/account_tracker_service.h"
#include "components/signin/internal/identity_manager/primary_account_manager.h"
diff --git a/components/signin/internal/identity_manager/profile_oauth2_token_service.cc b/components/signin/internal/identity_manager/profile_oauth2_token_service.cc
index e245f59..9c7d71aa 100644
--- a/components/signin/internal/identity_manager/profile_oauth2_token_service.cc
+++ b/components/signin/internal/identity_manager/profile_oauth2_token_service.cc
@@ -5,7 +5,7 @@
#include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
#include "base/auto_reset.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/threading/thread_task_runner_handle.h"
#include "build/build_config.h"
#include "components/prefs/pref_registry_simple.h"
diff --git a/components/signin/internal/identity_manager/ubertoken_fetcher_impl.cc b/components/signin/internal/identity_manager/ubertoken_fetcher_impl.cc
index 3053e34b..e6fede8 100644
--- a/components/signin/internal/identity_manager/ubertoken_fetcher_impl.cc
+++ b/components/signin/internal/identity_manager/ubertoken_fetcher_impl.cc
@@ -7,7 +7,7 @@
#include <vector>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/metrics/histogram_macros.h"
#include "base/rand_util.h"
#include "base/time/time.h"
diff --git a/components/signin/public/base/account_consistency_method.cc b/components/signin/public/base/account_consistency_method.cc
index 09b9630..335bc69d 100644
--- a/components/signin/public/base/account_consistency_method.cc
+++ b/components/signin/public/base/account_consistency_method.cc
@@ -4,7 +4,6 @@
#include "components/signin/public/base/account_consistency_method.h"
-#include "base/logging.h"
namespace signin {
diff --git a/components/signin/public/base/device_id_helper.cc b/components/signin/public/base/device_id_helper.cc
index 99c262a..e23896e8 100644
--- a/components/signin/public/base/device_id_helper.cc
+++ b/components/signin/public/base/device_id_helper.cc
@@ -4,9 +4,9 @@
#include "components/signin/public/base/device_id_helper.h"
+#include "base/check.h"
#include "base/command_line.h"
#include "base/guid.h"
-#include "base/logging.h"
#include "components/prefs/pref_service.h"
#include "components/signin/public/base/signin_pref_names.h"
#include "components/signin/public/base/signin_switches.h"
diff --git a/components/signin/public/base/test_signin_client.cc b/components/signin/public/base/test_signin_client.cc
index 9ae7b3931..6a42a4a 100644
--- a/components/signin/public/base/test_signin_client.cc
+++ b/components/signin/public/base/test_signin_client.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/threading/thread_task_runner_handle.h"
#include "google_apis/gaia/gaia_auth_util.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
diff --git a/components/signin/public/identity_manager/access_token_fetcher.cc b/components/signin/public/identity_manager/access_token_fetcher.cc
index 4ed181b0..89baf10 100644
--- a/components/signin/public/identity_manager/access_token_fetcher.cc
+++ b/components/signin/public/identity_manager/access_token_fetcher.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/signin/public/identity_manager/access_token_info.h"
#include "google_apis/gaia/google_service_auth_error.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
diff --git a/components/signin/public/identity_manager/primary_account_access_token_fetcher.cc b/components/signin/public/identity_manager/primary_account_access_token_fetcher.cc
index 56d1b5c..7fe9fcb3 100644
--- a/components/signin/public/identity_manager/primary_account_access_token_fetcher.cc
+++ b/components/signin/public/identity_manager/primary_account_access_token_fetcher.cc
@@ -7,7 +7,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/signin/public/identity_manager/access_token_info.h"
#include "google_apis/gaia/core_account_id.h"
#include "google_apis/gaia/google_service_auth_error.h"
diff --git a/components/spellcheck/browser/spellcheck_platform_android.cc b/components/spellcheck/browser/spellcheck_platform_android.cc
index fd7d57fb..421c853 100644
--- a/components/spellcheck/browser/spellcheck_platform_android.cc
+++ b/components/spellcheck/browser/spellcheck_platform_android.cc
@@ -6,7 +6,7 @@
#include "base/callback.h"
#include "base/command_line.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "components/spellcheck/common/spellcheck_features.h"
class PlatformSpellChecker;
diff --git a/components/spellcheck/common/spellcheck_common.cc b/components/spellcheck/common/spellcheck_common.cc
index ef9a5159..2d793b3 100644
--- a/components/spellcheck/common/spellcheck_common.cc
+++ b/components/spellcheck/common/spellcheck_common.cc
@@ -4,9 +4,9 @@
#include "components/spellcheck/common/spellcheck_common.h"
+#include "base/check.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
-#include "base/logging.h"
#include "base/metrics/field_trial.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
diff --git a/components/spellcheck/renderer/spellcheck.cc b/components/spellcheck/renderer/spellcheck.cc
index b5ff797..53f87d5 100644
--- a/components/spellcheck/renderer/spellcheck.cc
+++ b/components/spellcheck/renderer/spellcheck.cc
@@ -11,10 +11,11 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/command_line.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/macros.h"
+#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/components/sqlite_proto/table_manager.cc b/components/sqlite_proto/table_manager.cc
index 9e56c88..e608ac5b 100644
--- a/components/sqlite_proto/table_manager.cc
+++ b/components/sqlite_proto/table_manager.cc
@@ -7,7 +7,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/sequenced_task_runner.h"
#include "sql/database.h"
diff --git a/components/startup_metric_utils/browser/startup_metric_utils.cc b/components/startup_metric_utils/browser/startup_metric_utils.cc
index 29394fc..582e91a5 100644
--- a/components/startup_metric_utils/browser/startup_metric_utils.cc
+++ b/components/startup_metric_utils/browser/startup_metric_utils.cc
@@ -10,11 +10,12 @@
#include <string>
#include <vector>
+#include "base/check_op.h"
#include "base/lazy_instance.h"
-#include "base/logging.h"
#include "base/memory/memory_pressure_listener.h"
#include "base/metrics/histogram.h"
#include "base/metrics/histogram_functions.h"
+#include "base/notreached.h"
#include "base/process/process.h"
#include "base/strings/string_number_conversions.h"
#include "base/threading/platform_thread.h"
diff --git a/components/storage_monitor/media_storage_util.cc b/components/storage_monitor/media_storage_util.cc
index d19f2eb0..1def34a9 100644
--- a/components/storage_monitor/media_storage_util.cc
+++ b/components/storage_monitor/media_storage_util.cc
@@ -8,8 +8,8 @@
#include "base/bind.h"
#include "base/callback.h"
+#include "base/check_op.h"
#include "base/files/file_util.h"
-#include "base/logging.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/post_task.h"
diff --git a/components/storage_monitor/storage_info.cc b/components/storage_monitor/storage_info.cc
index 73bf072..efb61b4 100644
--- a/components/storage_monitor/storage_info.cc
+++ b/components/storage_monitor/storage_info.cc
@@ -6,7 +6,8 @@
#include <stddef.h>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/utf_string_conversions.h"
#include "components/storage_monitor/media_storage_util.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/components/storage_monitor/storage_monitor_chromeos.cc b/components/storage_monitor/storage_monitor_chromeos.cc
index b1ef7ba..12379d7 100644
--- a/components/storage_monitor/storage_monitor_chromeos.cc
+++ b/components/storage_monitor/storage_monitor_chromeos.cc
@@ -8,8 +8,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check_op.h"
#include "base/files/file_path.h"
-#include "base/logging.h"
#include "base/sequenced_task_runner.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
diff --git a/components/storage_monitor/storage_monitor_chromeos_unittest.cc b/components/storage_monitor/storage_monitor_chromeos_unittest.cc
index 6f4c1369..1529bf5 100644
--- a/components/storage_monitor/storage_monitor_chromeos_unittest.cc
+++ b/components/storage_monitor/storage_monitor_chromeos_unittest.cc
@@ -13,7 +13,6 @@
#include "base/bind.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/storage_monitor/storage_monitor_fuchsia.cc b/components/storage_monitor/storage_monitor_fuchsia.cc
index da11d97..20a488f 100644
--- a/components/storage_monitor/storage_monitor_fuchsia.cc
+++ b/components/storage_monitor/storage_monitor_fuchsia.cc
@@ -4,7 +4,7 @@
#include "components/storage_monitor/storage_monitor.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace storage_monitor {
diff --git a/components/storage_monitor/storage_monitor_linux_unittest.cc b/components/storage_monitor/storage_monitor_linux_unittest.cc
index 00dd8f48..382502b 100644
--- a/components/storage_monitor/storage_monitor_linux_unittest.cc
+++ b/components/storage_monitor/storage_monitor_linux_unittest.cc
@@ -15,9 +15,9 @@
#include <string>
#include "base/bind.h"
+#include "base/check.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/logging.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/storage_monitor/transient_device_ids.cc b/components/storage_monitor/transient_device_ids.cc
index 27e9d8b..360ca2f7 100644
--- a/components/storage_monitor/transient_device_ids.cc
+++ b/components/storage_monitor/transient_device_ids.cc
@@ -6,8 +6,8 @@
#include "components/storage_monitor/transient_device_ids.h"
+#include "base/check.h"
#include "base/guid.h"
-#include "base/logging.h"
#include "base/stl_util.h"
#include "components/storage_monitor/storage_info.h"
diff --git a/components/subresource_filter/content/browser/async_document_subresource_filter.cc b/components/subresource_filter/content/browser/async_document_subresource_filter.cc
index ce1fe74..6d53d988 100644
--- a/components/subresource_filter/content/browser/async_document_subresource_filter.cc
+++ b/components/subresource_filter/content/browser/async_document_subresource_filter.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/task_runner_util.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "components/subresource_filter/core/common/memory_mapped_ruleset.h"
diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
index 0614fd7b2..ec59d86 100644
--- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
+++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
@@ -7,9 +7,10 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/feature_list.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/trace_event/trace_event.h"
#include "base/trace_event/traced_value.h"
diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager_unittest.cc b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager_unittest.cc
index df355033..c01d517 100644
--- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager_unittest.cc
+++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager_unittest.cc
@@ -11,8 +11,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check.h"
#include "base/command_line.h"
-#include "base/logging.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/test/metrics/histogram_tester.h"
diff --git a/components/subresource_filter/content/browser/fake_safe_browsing_database_manager.cc b/components/subresource_filter/content/browser/fake_safe_browsing_database_manager.cc
index e990cbad..cfcdcfc 100644
--- a/components/subresource_filter/content/browser/fake_safe_browsing_database_manager.cc
+++ b/components/subresource_filter/content/browser/fake_safe_browsing_database_manager.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/task/post_task.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
diff --git a/components/subresource_filter/content/browser/page_load_statistics.cc b/components/subresource_filter/content/browser/page_load_statistics.cc
index efaf382b..4272fb1 100644
--- a/components/subresource_filter/content/browser/page_load_statistics.cc
+++ b/components/subresource_filter/content/browser/page_load_statistics.cc
@@ -4,7 +4,7 @@
#include "components/subresource_filter/content/browser/page_load_statistics.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/metrics/histogram_macros.h"
#include "components/subresource_filter/core/common/time_measurements.h"
diff --git a/components/subresource_filter/content/browser/ruleset_publisher_impl.cc b/components/subresource_filter/content/browser/ruleset_publisher_impl.cc
index 552cce1..b8aaf172 100644
--- a/components/subresource_filter/content/browser/ruleset_publisher_impl.cc
+++ b/components/subresource_filter/content/browser/ruleset_publisher_impl.cc
@@ -7,10 +7,10 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/feature_list.h"
#include "base/files/file_util.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/sequenced_task_runner.h"
#include "base/task/post_task.h"
#include "base/task/thread_pool.h"
diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/components/subresource_filter/content/browser/ruleset_service.cc
index a983ba7e..d26c52d1 100644
--- a/components/subresource_filter/content/browser/ruleset_service.cc
+++ b/components/subresource_filter/content/browser/ruleset_service.cc
@@ -7,11 +7,11 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/files/file_enumerator.h"
#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/metrics/histogram_macros.h"
#include "base/numerics/safe_conversions.h"
diff --git a/components/subresource_filter/content/browser/subframe_navigation_filtering_throttle.cc b/components/subresource_filter/content/browser/subframe_navigation_filtering_throttle.cc
index c6dd83de..0e0d5fd 100644
--- a/components/subresource_filter/content/browser/subframe_navigation_filtering_throttle.cc
+++ b/components/subresource_filter/content/browser/subframe_navigation_filtering_throttle.cc
@@ -7,9 +7,9 @@
#include <sstream>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/debug/alias.h"
#include "base/debug/dump_without_crashing.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/stringprintf.h"
#include "components/subresource_filter/content/browser/subresource_filter_observer_manager.h"
diff --git a/components/subresource_filter/content/browser/subresource_filter_observer_test_utils.cc b/components/subresource_filter/content/browser/subresource_filter_observer_test_utils.cc
index 17b1988..4b4389b 100644
--- a/components/subresource_filter/content/browser/subresource_filter_observer_test_utils.cc
+++ b/components/subresource_filter/content/browser/subresource_filter_observer_test_utils.cc
@@ -4,7 +4,7 @@
#include "components/subresource_filter/content/browser/subresource_filter_observer_test_utils.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/subresource_filter/core/mojom/subresource_filter.mojom.h"
#include "content/public/browser/navigation_handle.h"
#include "content/public/browser/render_frame_host.h"
diff --git a/components/subresource_filter/content/browser/subresource_filter_safe_browsing_client.cc b/components/subresource_filter/content/browser/subresource_filter_safe_browsing_client.cc
index cbe4a14..13c4530 100644
--- a/components/subresource_filter/content/browser/subresource_filter_safe_browsing_client.cc
+++ b/components/subresource_filter/content/browser/subresource_filter_safe_browsing_client.cc
@@ -7,8 +7,8 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/single_thread_task_runner.h"
#include "base/trace_event/trace_event.h"
#include "base/trace_event/traced_value.h"
diff --git a/components/subresource_filter/content/browser/subresource_filter_safe_browsing_client_request.cc b/components/subresource_filter/content/browser/subresource_filter_safe_browsing_client_request.cc
index 80357f0..2e8d4b6 100644
--- a/components/subresource_filter/content/browser/subresource_filter_safe_browsing_client_request.cc
+++ b/components/subresource_filter/content/browser/subresource_filter_safe_browsing_client_request.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/single_thread_task_runner.h"
#include "components/subresource_filter/content/browser/subresource_filter_safe_browsing_client.h"
#include "content/public/browser/browser_thread.h"
diff --git a/components/subresource_filter/content/browser/verified_ruleset_dealer.cc b/components/subresource_filter/content/browser/verified_ruleset_dealer.cc
index 4ab0e55c..3a33308 100644
--- a/components/subresource_filter/content/browser/verified_ruleset_dealer.cc
+++ b/components/subresource_filter/content/browser/verified_ruleset_dealer.cc
@@ -8,10 +8,11 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check.h"
#include "base/files/file.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/task_runner_util.h"
#include "base/trace_event/trace_event.h"
#include "components/subresource_filter/core/common/indexed_ruleset.h"
diff --git a/components/subresource_filter/content/common/ruleset_dealer.cc b/components/subresource_filter/content/common/ruleset_dealer.cc
index 5914def..30a8629f 100644
--- a/components/subresource_filter/content/common/ruleset_dealer.cc
+++ b/components/subresource_filter/content/common/ruleset_dealer.cc
@@ -4,7 +4,7 @@
#include "components/subresource_filter/content/common/ruleset_dealer.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/subresource_filter/core/common/memory_mapped_ruleset.h"
namespace subresource_filter {
diff --git a/components/subresource_filter/content/renderer/subresource_filter_agent.cc b/components/subresource_filter/content/renderer/subresource_filter_agent.cc
index 11a223d..37fc27a1 100644
--- a/components/subresource_filter/content/renderer/subresource_filter_agent.cc
+++ b/components/subresource_filter/content/renderer/subresource_filter_agent.cc
@@ -8,8 +8,8 @@
#include <vector>
#include "base/bind.h"
+#include "base/check.h"
#include "base/feature_list.h"
-#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/metrics/histogram_macros.h"
#include "base/time/time.h"
diff --git a/components/subresource_filter/core/common/activation_list.cc b/components/subresource_filter/core/common/activation_list.cc
index 4ff9bf7c..77effaf2 100644
--- a/components/subresource_filter/core/common/activation_list.cc
+++ b/components/subresource_filter/core/common/activation_list.cc
@@ -6,7 +6,7 @@
#include <ostream>
-#include "base/logging.h"
+#include "base/notreached.h"
namespace subresource_filter {
diff --git a/components/subresource_filter/core/common/activation_scope.cc b/components/subresource_filter/core/common/activation_scope.cc
index 9b93957..445057d 100644
--- a/components/subresource_filter/core/common/activation_scope.cc
+++ b/components/subresource_filter/core/common/activation_scope.cc
@@ -6,7 +6,7 @@
#include <ostream>
-#include "base/logging.h"
+#include "base/notreached.h"
namespace subresource_filter {
diff --git a/components/subresource_filter/core/common/document_subresource_filter.cc b/components/subresource_filter/core/common/document_subresource_filter.cc
index 69403725..94f4782 100644
--- a/components/subresource_filter/core/common/document_subresource_filter.cc
+++ b/components/subresource_filter/core/common/document_subresource_filter.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/trace_event/trace_event.h"
#include "components/subresource_filter/core/common/first_party_origin.h"
#include "components/subresource_filter/core/common/memory_mapped_ruleset.h"
diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/components/subresource_filter/core/common/indexed_ruleset.cc
index 85533ab..aa39659 100644
--- a/components/subresource_filter/core/common/indexed_ruleset.cc
+++ b/components/subresource_filter/core/common/indexed_ruleset.cc
@@ -4,7 +4,7 @@
#include "components/subresource_filter/core/common/indexed_ruleset.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/metrics/histogram_macros.h"
#include "base/trace_event/trace_event.h"
#include "components/subresource_filter/core/common/first_party_origin.h"
diff --git a/components/subresource_filter/core/common/indexed_ruleset_unittest.cc b/components/subresource_filter/core/common/indexed_ruleset_unittest.cc
index d8a45e8..a55f5d0 100644
--- a/components/subresource_filter/core/common/indexed_ruleset_unittest.cc
+++ b/components/subresource_filter/core/common/indexed_ruleset_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/macros.h"
#include "base/strings/string_piece.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/subresource_filter/core/common/memory_mapped_ruleset.cc b/components/subresource_filter/core/common/memory_mapped_ruleset.cc
index 3ecbbe73..cb2e649 100644
--- a/components/subresource_filter/core/common/memory_mapped_ruleset.cc
+++ b/components/subresource_filter/core/common/memory_mapped_ruleset.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
namespace subresource_filter {
diff --git a/components/subresource_filter/core/common/test_ruleset_creator.cc b/components/subresource_filter/core/common/test_ruleset_creator.cc
index 4d359de..9fab0093 100644
--- a/components/subresource_filter/core/common/test_ruleset_creator.cc
+++ b/components/subresource_filter/core/common/test_ruleset_creator.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <string>
+#include "base/check.h"
#include "base/files/file_util.h"
-#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/threading/thread_restrictions.h"
#include "components/subresource_filter/core/common/indexed_ruleset.h"
diff --git a/components/subresource_filter/core/common/unindexed_ruleset.cc b/components/subresource_filter/core/common/unindexed_ruleset.cc
index 1ff52eb1..b6ff84f4 100644
--- a/components/subresource_filter/core/common/unindexed_ruleset.cc
+++ b/components/subresource_filter/core/common/unindexed_ruleset.cc
@@ -4,7 +4,7 @@
#include "components/subresource_filter/core/common/unindexed_ruleset.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/numerics/safe_conversions.h"
namespace subresource_filter {
diff --git a/components/subresource_filter/tools/ruleset_converter/rule_stream.cc b/components/subresource_filter/tools/ruleset_converter/rule_stream.cc
index 0b721da0..585b8b4 100644
--- a/components/subresource_filter/tools/ruleset_converter/rule_stream.cc
+++ b/components/subresource_filter/tools/ruleset_converter/rule_stream.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/subresource_filter/core/common/unindexed_ruleset.h"
#include "components/subresource_filter/tools/rule_parser/rule.h"
#include "components/subresource_filter/tools/rule_parser/rule_parser.h"
diff --git a/components/subresource_filter/tools/ruleset_converter/rule_stream_unittest.cc b/components/subresource_filter/tools/ruleset_converter/rule_stream_unittest.cc
index dfd1001b..49033d3 100644
--- a/components/subresource_filter/tools/ruleset_converter/rule_stream_unittest.cc
+++ b/components/subresource_filter/tools/ruleset_converter/rule_stream_unittest.cc
@@ -11,7 +11,6 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
diff --git a/components/subresource_filter/tools/ruleset_converter/ruleset_converter.cc b/components/subresource_filter/tools/ruleset_converter/ruleset_converter.cc
index a10ba91..b88c392f 100644
--- a/components/subresource_filter/tools/ruleset_converter/ruleset_converter.cc
+++ b/components/subresource_filter/tools/ruleset_converter/ruleset_converter.cc
@@ -7,8 +7,8 @@
#include <fstream>
#include <iostream>
+#include "base/check.h"
#include "base/files/file_util.h"
-#include "base/logging.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
diff --git a/components/sync/base/cancelation_signal.cc b/components/sync/base/cancelation_signal.cc
index e68a244..ca907d7 100644
--- a/components/sync/base/cancelation_signal.cc
+++ b/components/sync/base/cancelation_signal.cc
@@ -4,7 +4,7 @@
#include "components/sync/base/cancelation_signal.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/sync/base/cancelation_observer.h"
namespace syncer {
diff --git a/components/sync/base/node_ordinal.cc b/components/sync/base/node_ordinal.cc
index 1b42953..51dd90d6 100644
--- a/components/sync/base/node_ordinal.cc
+++ b/components/sync/base/node_ordinal.cc
@@ -7,7 +7,8 @@
#include <algorithm>
#include <string>
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
namespace syncer {
diff --git a/components/sync/base/passphrase_enums.cc b/components/sync/base/passphrase_enums.cc
index 2211706..fffa72b 100644
--- a/components/sync/base/passphrase_enums.cc
+++ b/components/sync/base/passphrase_enums.cc
@@ -4,7 +4,8 @@
#include "components/sync/base/passphrase_enums.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
namespace syncer {
diff --git a/components/sync/base/sync_prefs.cc b/components/sync/base/sync_prefs.cc
index f2b7f24..d959723 100644
--- a/components/sync/base/sync_prefs.cc
+++ b/components/sync/base/sync_prefs.cc
@@ -9,8 +9,9 @@
#include "base/base64.h"
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/files/file_path.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/path_service.h"
#include "base/rand_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/components/sync/base/syncer_error.cc b/components/sync/base/syncer_error.cc
index ede7462..f0af128 100644
--- a/components/sync/base/syncer_error.cc
+++ b/components/sync/base/syncer_error.cc
@@ -4,7 +4,8 @@
#include "components/sync/base/syncer_error.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "net/base/net_errors.h"
#include "net/http/http_status_code.h"
diff --git a/components/sync/base/user_demographics.cc b/components/sync/base/user_demographics.cc
index ffd0081..06a887d 100644
--- a/components/sync/base/user_demographics.cc
+++ b/components/sync/base/user_demographics.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
namespace syncer {
diff --git a/components/sync/base/user_selectable_type.cc b/components/sync/base/user_selectable_type.cc
index a867983..5c6cfe8 100644
--- a/components/sync/base/user_selectable_type.cc
+++ b/components/sync/base/user_selectable_type.cc
@@ -6,7 +6,7 @@
#include <type_traits>
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/optional.h"
#include "components/sync/base/model_type.h"
#include "components/sync/base/pref_names.h"
diff --git a/components/sync/driver/about_sync_util.cc b/components/sync/driver/about_sync_util.cc
index 832bc9d..6446c213 100644
--- a/components/sync/driver/about_sync_util.cc
+++ b/components/sync/driver/about_sync_util.cc
@@ -9,7 +9,7 @@
#include <vector>
#include "base/i18n/time_formatting.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/sync/driver/model_type_controller_unittest.cc b/components/sync/driver/model_type_controller_unittest.cc
index 8bf390d..47e5eaf 100644
--- a/components/sync/driver/model_type_controller_unittest.cc
+++ b/components/sync/driver/model_type_controller_unittest.cc
@@ -9,7 +9,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/run_loop.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/mock_callback.h"
diff --git a/components/sync/driver/passphrase_type_metrics_provider.cc b/components/sync/driver/passphrase_type_metrics_provider.cc
index d5ff05a..e632672 100644
--- a/components/sync/driver/passphrase_type_metrics_provider.cc
+++ b/components/sync/driver/passphrase_type_metrics_provider.cc
@@ -4,9 +4,10 @@
#include "components/sync/driver/passphrase_type_metrics_provider.h"
+#include "base/check.h"
#include "base/containers/flat_set.h"
-#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
+#include "base/notreached.h"
#include "components/sync/base/passphrase_enums.h"
#include "components/sync/driver/sync_service.h"
#include "components/sync/driver/sync_user_settings.h"
diff --git a/components/sync/driver/sync_stopped_reporter.cc b/components/sync/driver/sync_stopped_reporter.cc
index 2e22c0db..53b919d 100644
--- a/components/sync/driver/sync_stopped_reporter.cc
+++ b/components/sync/driver/sync_stopped_reporter.cc
@@ -7,8 +7,8 @@
#include <utility>
#include "base/bind.h"
+#include "base/check.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/sequenced_task_runner.h"
#include "base/strings/stringprintf.h"
#include "base/threading/sequenced_task_runner_handle.h"
diff --git a/components/sync/engine/engine_util.cc b/components/sync/engine/engine_util.cc
index ab72a6fb..f93505c 100644
--- a/components/sync/engine/engine_util.cc
+++ b/components/sync/engine/engine_util.cc
@@ -8,7 +8,8 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "components/sync/nigori/cryptographer.h"
#include "components/sync/protocol/password_specifics.pb.h"
diff --git a/components/sync/engine/shutdown_reason.cc b/components/sync/engine/shutdown_reason.cc
index c95f91c..4681984 100644
--- a/components/sync/engine/shutdown_reason.cc
+++ b/components/sync/engine/shutdown_reason.cc
@@ -4,7 +4,7 @@
#include "components/sync/engine/shutdown_reason.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace syncer {
diff --git a/components/sync/engine_impl/cycle/data_type_tracker.cc b/components/sync/engine_impl/cycle/data_type_tracker.cc
index 27c23a9..87d67a55 100644
--- a/components/sync/engine_impl/cycle/data_type_tracker.cc
+++ b/components/sync/engine_impl/cycle/data_type_tracker.cc
@@ -7,7 +7,8 @@
#include <algorithm>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "components/sync/engine_impl/cycle/nudge_tracker.h"
namespace syncer {
diff --git a/components/sync/engine_impl/js_mutation_event_observer.cc b/components/sync/engine_impl/js_mutation_event_observer.cc
index fdcca720..fef4d22 100644
--- a/components/sync/engine_impl/js_mutation_event_observer.cc
+++ b/components/sync/engine_impl/js_mutation_event_observer.cc
@@ -9,8 +9,9 @@
#include <memory>
#include <utility>
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "components/sync/js/js_event_details.h"
diff --git a/components/sync/engine_impl/js_sync_encryption_handler_observer.cc b/components/sync/engine_impl/js_sync_encryption_handler_observer.cc
index 2ad5e6ef..12f3f8b 100644
--- a/components/sync/engine_impl/js_sync_encryption_handler_observer.cc
+++ b/components/sync/engine_impl/js_sync_encryption_handler_observer.cc
@@ -7,7 +7,7 @@
#include <cstddef>
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "components/sync/base/model_type.h"
diff --git a/components/sync/engine_impl/js_sync_manager_observer.cc b/components/sync/engine_impl/js_sync_manager_observer.cc
index 34b2a39..0387bb86 100644
--- a/components/sync/engine_impl/js_sync_manager_observer.cc
+++ b/components/sync/engine_impl/js_sync_manager_observer.cc
@@ -7,7 +7,7 @@
#include <cstddef>
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "components/sync/base/model_type.h"
diff --git a/components/sync/engine_impl/loopback_server/loopback_server_entity.cc b/components/sync/engine_impl/loopback_server/loopback_server_entity.cc
index 01b9efb..b314a6f3 100644
--- a/components/sync/engine_impl/loopback_server/loopback_server_entity.cc
+++ b/components/sync/engine_impl/loopback_server/loopback_server_entity.cc
@@ -8,8 +8,8 @@
#include <vector>
#include "base/guid.h"
-#include "base/logging.h"
#include "base/memory/ref_counted.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
diff --git a/components/sync/model/entity_data.cc b/components/sync/model/entity_data.cc
index 19cdbf7..38272fb 100644
--- a/components/sync/model/entity_data.cc
+++ b/components/sync/model/entity_data.cc
@@ -9,7 +9,6 @@
#include <utility>
#include "base/json/json_writer.h"
-#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/trace_event/memory_usage_estimator.h"
diff --git a/components/sync/model_impl/blocking_model_type_store_impl.cc b/components/sync/model_impl/blocking_model_type_store_impl.cc
index 71889f89..baba38e 100644
--- a/components/sync/model_impl/blocking_model_type_store_impl.cc
+++ b/components/sync/model_impl/blocking_model_type_store_impl.cc
@@ -6,8 +6,8 @@
#include <utility>
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/optional.h"
diff --git a/components/sync/model_impl/model_type_store_impl.cc b/components/sync/model_impl/model_type_store_impl.cc
index cda3d4e..d460fe8 100644
--- a/components/sync/model_impl/model_type_store_impl.cc
+++ b/components/sync/model_impl/model_type_store_impl.cc
@@ -9,8 +9,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/optional.h"
#include "base/task_runner_util.h"
#include "components/sync/model/model_error.h"
diff --git a/components/sync/nigori/cryptographer_impl.cc b/components/sync/nigori/cryptographer_impl.cc
index d6d16db..443adf68 100644
--- a/components/sync/nigori/cryptographer_impl.cc
+++ b/components/sync/nigori/cryptographer_impl.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/ptr_util.h"
namespace syncer {
diff --git a/components/sync/nigori/nigori.cc b/components/sync/nigori/nigori.cc
index 89651fd..7b4b9db0 100644
--- a/components/sync/nigori/nigori.cc
+++ b/components/sync/nigori/nigori.cc
@@ -10,10 +10,11 @@
#include <vector>
#include "base/base64.h"
+#include "base/check_op.h"
#include "base/feature_list.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_functions.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
diff --git a/components/sync/protocol/sync_protocol_error.cc b/components/sync/protocol/sync_protocol_error.cc
index ea9781b..9739564 100644
--- a/components/sync/protocol/sync_protocol_error.cc
+++ b/components/sync/protocol/sync_protocol_error.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/notreached.h"
namespace syncer {
#define ENUM_CASE(x) \
diff --git a/components/sync/syncable/change_record_unittest.cc b/components/sync/syncable/change_record_unittest.cc
index dce11d56..5a4cff0f 100644
--- a/components/sync/syncable/change_record_unittest.cc
+++ b/components/sync/syncable/change_record_unittest.cc
@@ -9,7 +9,7 @@
#include <string>
#include <utility>
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/test/values_test_util.h"
#include "base/values.h"
diff --git a/components/sync/syncable/on_disk_directory_backing_store.cc b/components/sync/syncable/on_disk_directory_backing_store.cc
index 9ca819f..d055c959 100644
--- a/components/sync/syncable/on_disk_directory_backing_store.cc
+++ b/components/sync/syncable/on_disk_directory_backing_store.cc
@@ -4,8 +4,9 @@
#include "components/sync/syncable/on_disk_directory_backing_store.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
namespace syncer {
namespace syncable {
diff --git a/components/sync/syncable/syncable_enum_conversions.cc b/components/sync/syncable/syncable_enum_conversions.cc
index 4bd65df..ee3fd317 100644
--- a/components/sync/syncable/syncable_enum_conversions.cc
+++ b/components/sync/syncable/syncable_enum_conversions.cc
@@ -4,7 +4,7 @@
#include "components/sync/syncable/syncable_enum_conversions.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace syncer {
namespace syncable {
diff --git a/components/sync/syncable/syncable_id.cc b/components/sync/syncable/syncable_id.cc
index 37110c42..b22972c0 100644
--- a/components/sync/syncable/syncable_id.cc
+++ b/components/sync/syncable/syncable_id.cc
@@ -4,7 +4,7 @@
#include "components/sync/syncable/syncable_id.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/values.h"
using std::ostream;
diff --git a/components/sync/syncable/syncable_unittest.cc b/components/sync/syncable/syncable_unittest.cc
index 9e1dcb9..746b5d5 100644
--- a/components/sync/syncable/syncable_unittest.cc
+++ b/components/sync/syncable/syncable_unittest.cc
@@ -8,12 +8,12 @@
#include <string>
#include "base/bind_helpers.h"
+#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "base/synchronization/condition_variable.h"
diff --git a/components/sync/test/engine/mock_model_type_worker.cc b/components/sync/test/engine/mock_model_type_worker.cc
index 8a6fdbb..e32a928 100644
--- a/components/sync/test/engine/mock_model_type_worker.cc
+++ b/components/sync/test/engine/mock_model_type_worker.cc
@@ -7,7 +7,8 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "components/sync/base/model_type.h"
#include "components/sync/syncable/syncable_util.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/sync/test/mock_invalidation.cc b/components/sync/test/mock_invalidation.cc
index f29309d..213c21f 100644
--- a/components/sync/test/mock_invalidation.cc
+++ b/components/sync/test/mock_invalidation.cc
@@ -4,7 +4,7 @@
#include "components/sync/test/mock_invalidation.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/sync/test/mock_invalidation_tracker.h"
namespace syncer {
diff --git a/components/sync/test/mock_invalidation_tracker.cc b/components/sync/test/mock_invalidation_tracker.cc
index 5cbd6a5..8126ec4b 100644
--- a/components/sync/test/mock_invalidation_tracker.cc
+++ b/components/sync/test/mock_invalidation_tracker.cc
@@ -4,7 +4,7 @@
#include "components/sync/test/mock_invalidation_tracker.h"
-#include "base/logging.h"
+#include "base/check_op.h"
namespace syncer {
diff --git a/components/sync/test/test_directory_backing_store.cc b/components/sync/test/test_directory_backing_store.cc
index 9a4b044..406b48ce 100644
--- a/components/sync/test/test_directory_backing_store.cc
+++ b/components/sync/test/test_directory_backing_store.cc
@@ -4,7 +4,7 @@
#include "components/sync/test/test_directory_backing_store.h"
-#include "base/logging.h"
+#include "base/check.h"
namespace syncer {
namespace syncable {
diff --git a/components/sync_device_info/fake_device_info_tracker.cc b/components/sync_device_info/fake_device_info_tracker.cc
index 8c4704a..6dcd283 100644
--- a/components/sync_device_info/fake_device_info_tracker.cc
+++ b/components/sync_device_info/fake_device_info_tracker.cc
@@ -4,7 +4,8 @@
#include "components/sync_device_info/fake_device_info_tracker.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "components/sync_device_info/device_info.h"
namespace {
diff --git a/components/sync_device_info/local_device_info_util_win.cc b/components/sync_device_info/local_device_info_util_win.cc
index 6b175c0..20bc7c5 100644
--- a/components/sync_device_info/local_device_info_util_win.cc
+++ b/components/sync_device_info/local_device_info_util_win.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/sync_user_events/user_event_sync_bridge.cc b/components/sync_user_events/user_event_sync_bridge.cc
index 0e77150..c11def5 100644
--- a/components/sync_user_events/user_event_sync_bridge.cc
+++ b/components/sync_user_events/user_event_sync_bridge.cc
@@ -11,8 +11,8 @@
#include "base/big_endian.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "build/build_config.h"
diff --git a/components/tab_count_metrics/tab_count_metrics.cc b/components/tab_count_metrics/tab_count_metrics.cc
index 3dd16af..13f47b1 100644
--- a/components/tab_count_metrics/tab_count_metrics.cc
+++ b/components/tab_count_metrics/tab_count_metrics.cc
@@ -6,7 +6,8 @@
#include <limits>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
namespace tab_count_metrics {
diff --git a/components/tracing/test/perf_test_helpers.cc b/components/tracing/test/perf_test_helpers.cc
index 4139f20..37bac9c 100644
--- a/components/tracing/test/perf_test_helpers.cc
+++ b/components/tracing/test/perf_test_helpers.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "base/logging.h"
+#include "base/check.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/perf/perf_result_reporter.h"
diff --git a/components/translate/content/browser/content_translate_driver.cc b/components/translate/content/browser/content_translate_driver.cc
index f275ebf..7c2adcf 100644
--- a/components/translate/content/browser/content_translate_driver.cc
+++ b/components/translate/content/browser/content_translate_driver.cc
@@ -9,9 +9,10 @@
#include <utility>
#include "base/bind.h"
+#include "base/check.h"
#include "base/feature_list.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/utf_string_conversions.h"
#include "base/supports_user_data.h"
diff --git a/components/translate/content/browser/per_frame_content_translate_driver.cc b/components/translate/content/browser/per_frame_content_translate_driver.cc
index a85ca7f..75652cea 100644
--- a/components/translate/content/browser/per_frame_content_translate_driver.cc
+++ b/components/translate/content/browser/per_frame_content_translate_driver.cc
@@ -11,8 +11,8 @@
#include "base/bind.h"
#include "base/feature_list.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/utf_string_conversions.h"
#include "base/supports_user_data.h"
diff --git a/components/translate/content/renderer/per_frame_translate_agent.cc b/components/translate/content/renderer/per_frame_translate_agent.cc
index aaaf5280..fb195bc 100644
--- a/components/translate/content/renderer/per_frame_translate_agent.cc
+++ b/components/translate/content/renderer/per_frame_translate_agent.cc
@@ -5,11 +5,12 @@
#include "components/translate/content/renderer/per_frame_translate_agent.h"
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/json/string_escape.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/components/translate/content/renderer/translate_agent.cc b/components/translate/content/renderer/translate_agent.cc
index 174f68a..c3b668fb 100644
--- a/components/translate/content/renderer/translate_agent.cc
+++ b/components/translate/content/renderer/translate_agent.cc
@@ -7,11 +7,12 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/json/string_escape.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
diff --git a/components/translate/core/browser/language_state.cc b/components/translate/core/browser/language_state.cc
index cf04e55..08c9833e 100644
--- a/components/translate/core/browser/language_state.cc
+++ b/components/translate/core/browser/language_state.cc
@@ -4,7 +4,7 @@
#include "components/translate/core/browser/language_state.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/translate/core/browser/translate_driver.h"
namespace translate {
diff --git a/components/translate/core/browser/translate_browser_metrics.cc b/components/translate/core/browser/translate_browser_metrics.cc
index ff986527..cac6ddb7 100644
--- a/components/translate/core/browser/translate_browser_metrics.cc
+++ b/components/translate/core/browser/translate_browser_metrics.cc
@@ -8,10 +8,10 @@
#include <string>
-#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/metrics_hashes.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "components/language_usage_metrics/language_usage_metrics.h"
diff --git a/components/translate/core/browser/translate_download_manager.cc b/components/translate/core/browser/translate_download_manager.cc
index e6130e83..fdc5b5b 100644
--- a/components/translate/core/browser/translate_download_manager.cc
+++ b/components/translate/core/browser/translate_download_manager.cc
@@ -4,7 +4,7 @@
#include "components/translate/core/browser/translate_download_manager.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/singleton.h"
#include "components/translate/core/browser/translate_pref_names.h"
#include "components/translate/core/common/translate_switches.h"
diff --git a/components/translate/core/browser/translate_language_list.cc b/components/translate/core/browser/translate_language_list.cc
index f2605b0..6136c0a 100644
--- a/components/translate/core/browser/translate_language_list.cc
+++ b/components/translate/core/browser/translate_language_list.cc
@@ -9,9 +9,10 @@
#include <set>
#include "base/bind.h"
+#include "base/check.h"
#include "base/json/json_reader.h"
#include "base/lazy_instance.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
diff --git a/components/translate/core/common/translate_util.cc b/components/translate/core/common/translate_util.cc
index 7bb1abbb..c890404 100644
--- a/components/translate/core/common/translate_util.cc
+++ b/components/translate/core/common/translate_util.cc
@@ -11,7 +11,6 @@
#include "base/command_line.h"
#include "base/feature_list.h"
-#include "base/logging.h"
#include "base/stl_util.h"
#include "components/language/core/common/locale_util.h"
#include "components/translate/core/common/translate_switches.h"
diff --git a/components/ui_devtools/root_element.cc b/components/ui_devtools/root_element.cc
index a72082d6..cb04669 100644
--- a/components/ui_devtools/root_element.cc
+++ b/components/ui_devtools/root_element.cc
@@ -4,7 +4,7 @@
#include "components/ui_devtools/root_element.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "components/ui_devtools/Protocol.h"
#include "components/ui_devtools/ui_element_delegate.h"
diff --git a/components/ui_devtools/ui_element.cc b/components/ui_devtools/ui_element.cc
index 43295145..509ea5c 100644
--- a/components/ui_devtools/ui_element.cc
+++ b/components/ui_devtools/ui_element.cc
@@ -6,7 +6,8 @@
#include <algorithm>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "components/ui_devtools/Protocol.h"
#include "components/ui_devtools/ui_element_delegate.h"
diff --git a/components/ukm/test_ukm_recorder.cc b/components/ukm/test_ukm_recorder.cc
index 279c905..ab3b535 100644
--- a/components/ukm/test_ukm_recorder.cc
+++ b/components/ukm/test_ukm_recorder.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <iterator>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/metrics_hashes.h"
#include "base/task/post_task.h"
#include "base/threading/sequenced_task_runner_handle.h"
diff --git a/components/undo/undo_manager.cc b/components/undo/undo_manager.cc
index d5e7442..d9d77458 100644
--- a/components/undo/undo_manager.cc
+++ b/components/undo/undo_manager.cc
@@ -7,7 +7,7 @@
#include <utility>
#include "base/auto_reset.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ptr_util.h"
#include "components/strings/grit/components_strings.h"
#include "components/undo/undo_manager_observer.h"
diff --git a/components/unified_consent/unified_consent_service.cc b/components/unified_consent/unified_consent_service.cc
index 8302b043..d5a12a3 100644
--- a/components/unified_consent/unified_consent_service.cc
+++ b/components/unified_consent/unified_consent_service.cc
@@ -4,7 +4,7 @@
#include "components/unified_consent/unified_consent_service.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_macros.h"
#include "base/scoped_observer.h"
#include "base/threading/sequenced_task_runner_handle.h"
diff --git a/components/update_client/component.cc b/components/update_client/component.cc
index f5fe193..ed4d100 100644
--- a/components/update_client/component.cc
+++ b/components/update_client/component.cc
@@ -8,10 +8,11 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string_number_conversions.h"
#include "base/task/post_task.h"
diff --git a/components/update_client/component_patcher_operation.cc b/components/update_client/component_patcher_operation.cc
index 78f77f0..3dfdde9d 100644
--- a/components/update_client/component_patcher_operation.cc
+++ b/components/update_client/component_patcher_operation.cc
@@ -9,10 +9,11 @@
#include <vector>
#include "base/bind.h"
+#include "base/check.h"
#include "base/files/file_util.h"
#include "base/files/memory_mapped_file.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/task/post_task.h"
#include "base/threading/sequenced_task_runner_handle.h"
diff --git a/components/update_client/crx_downloader.cc b/components/update_client/crx_downloader.cc
index 96a2d844..b10f4e4 100644
--- a/components/update_client/crx_downloader.cc
+++ b/components/update_client/crx_downloader.cc
@@ -7,9 +7,9 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/files/file_util.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/task/thread_pool.h"
#include "base/threading/thread_task_runner_handle.h"
#include "build/build_config.h"
diff --git a/components/update_client/ping_manager.cc b/components/update_client/ping_manager.cc
index 3c2a60c..76caaad 100644
--- a/components/update_client/ping_manager.cc
+++ b/components/update_client/ping_manager.cc
@@ -12,8 +12,8 @@
#include <vector>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/threading/thread_task_runner_handle.h"
#include "components/update_client/component.h"
diff --git a/components/update_client/protocol_serializer.cc b/components/update_client/protocol_serializer.cc
index 5d106c5..1074c93 100644
--- a/components/update_client/protocol_serializer.cc
+++ b/components/update_client/protocol_serializer.cc
@@ -6,9 +6,9 @@
#include <utility>
+#include "base/check.h"
#include "base/containers/flat_map.h"
#include "base/guid.h"
-#include "base/logging.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
diff --git a/components/update_client/update_client.cc b/components/update_client/update_client.cc
index 07f8454..07873bb0 100644
--- a/components/update_client/update_client.cc
+++ b/components/update_client/update_client.cc
@@ -12,8 +12,8 @@
#include "base/bind.h"
#include "base/callback.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/observer_list.h"
#include "base/stl_util.h"
diff --git a/components/update_client/update_engine.cc b/components/update_client/update_engine.cc
index 7cb2e47..161f484d9 100644
--- a/components/update_client/update_engine.cc
+++ b/components/update_client/update_engine.cc
@@ -9,9 +9,9 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/guid.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/optional.h"
#include "base/stl_util.h"
#include "base/strings/strcat.h"
diff --git a/components/update_client/update_query_params.cc b/components/update_client/update_query_params.cc
index bfeb9e7..535d272 100644
--- a/components/update_client/update_query_params.cc
+++ b/components/update_client/update_query_params.cc
@@ -4,7 +4,7 @@
#include "components/update_client/update_query_params.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/stringprintf.h"
#include "base/system/sys_info.h"
#include "build/branding_buildflags.h"
diff --git a/components/upload_list/upload_list.cc b/components/upload_list/upload_list.cc
index e39549c..4a6b57e 100644
--- a/components/upload_list/upload_list.cc
+++ b/components/upload_list/upload_list.cc
@@ -9,7 +9,8 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "base/task/task_traits.h"
#include "base/task/thread_pool.h"
diff --git a/components/url_formatter/elide_url.cc b/components/url_formatter/elide_url.cc
index a765710..25b5627 100644
--- a/components/url_formatter/elide_url.cc
+++ b/components/url_formatter/elide_url.cc
@@ -6,8 +6,8 @@
#include <stddef.h>
+#include "base/check_op.h"
#include "base/i18n/rtl.h"
-#include "base/logging.h"
#include "base/numerics/ranges.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
diff --git a/components/url_formatter/spoof_checks/idn_spoof_checker.cc b/components/url_formatter/spoof_checks/idn_spoof_checker.cc
index 72b4929f..a38e182 100644
--- a/components/url_formatter/spoof_checks/idn_spoof_checker.cc
+++ b/components/url_formatter/spoof_checks/idn_spoof_checker.cc
@@ -4,7 +4,7 @@
#include "components/url_formatter/spoof_checks/idn_spoof_checker.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/no_destructor.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_piece.h"
diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
index 77a9c3c..0add6702 100644
--- a/components/url_formatter/url_fixer.cc
+++ b/components/url_formatter/url_fixer.cc
@@ -8,9 +8,9 @@
#include <algorithm>
+#include "base/check_op.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
-#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
diff --git a/components/url_matcher/string_pattern.cc b/components/url_matcher/string_pattern.cc
index 0131d72..1ac691b 100644
--- a/components/url_matcher/string_pattern.cc
+++ b/components/url_matcher/string_pattern.cc
@@ -7,7 +7,7 @@
#include <tuple>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
namespace url_matcher {
diff --git a/components/url_matcher/substring_set_matcher.cc b/components/url_matcher/substring_set_matcher.cc
index 90dacee..4bca606 100644
--- a/components/url_matcher/substring_set_matcher.cc
+++ b/components/url_matcher/substring_set_matcher.cc
@@ -9,8 +9,8 @@
#include <algorithm>
#include <queue>
+#include "base/check_op.h"
#include "base/containers/queue.h"
-#include "base/logging.h"
#include "base/numerics/checked_math.h"
#include "base/stl_util.h"
#include "base/trace_event/memory_usage_estimator.h"
diff --git a/components/url_matcher/url_matcher.cc b/components/url_matcher/url_matcher.cc
index 9a32dba..42cad3a 100644
--- a/components/url_matcher/url_matcher.cc
+++ b/components/url_matcher/url_matcher.cc
@@ -8,8 +8,9 @@
#include <iterator>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/ptr_util.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "url/gurl.h"
#include "url/url_canon.h"
diff --git a/components/url_matcher/url_matcher_factory.cc b/components/url_matcher/url_matcher_factory.cc
index fe676dd3..af99a765 100644
--- a/components/url_matcher/url_matcher_factory.cc
+++ b/components/url_matcher/url_matcher_factory.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
+#include "base/check.h"
#include "base/lazy_instance.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
diff --git a/components/url_pattern_index/url_pattern.cc b/components/url_pattern_index/url_pattern.cc
index 1d914efa..9a6b2da3 100644
--- a/components/url_pattern_index/url_pattern.cc
+++ b/components/url_pattern_index/url_pattern.cc
@@ -20,7 +20,8 @@
#include <algorithm>
#include <ostream>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/numerics/checked_math.h"
#include "base/strings/string_util.h"
#include "components/url_pattern_index/flat/url_pattern_index_generated.h"
diff --git a/components/url_pattern_index/url_pattern_index.cc b/components/url_pattern_index/url_pattern_index.cc
index 4397b519..73a48ff5 100644
--- a/components/url_pattern_index/url_pattern_index.cc
+++ b/components/url_pattern_index/url_pattern_index.cc
@@ -9,10 +9,11 @@
#include <string>
#include <utility>
+#include "base/check_op.h"
#include "base/containers/flat_map.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/no_destructor.h"
+#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
#include "base/optional.h"
#include "base/strings/string_piece.h"
diff --git a/components/url_pattern_index/url_rule_test_support.cc b/components/url_pattern_index/url_rule_test_support.cc
index 77701e5..86a518a 100644
--- a/components/url_pattern_index/url_rule_test_support.cc
+++ b/components/url_pattern_index/url_rule_test_support.cc
@@ -4,7 +4,7 @@
#include "components/url_pattern_index/url_rule_test_support.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "url/gurl.h"
#include "url/origin.h"
diff --git a/components/url_pattern_index/url_rule_util.cc b/components/url_pattern_index/url_rule_util.cc
index 7513b2a..d2e39e6 100644
--- a/components/url_pattern_index/url_rule_util.cc
+++ b/components/url_pattern_index/url_rule_util.cc
@@ -4,8 +4,8 @@
#include "components/url_pattern_index/url_rule_util.h"
-#include "base/logging.h"
#include "base/macros.h"
+#include "base/notreached.h"
#include "base/strings/string_util.h"
#include "components/url_pattern_index/flat/url_pattern_index_generated.h"
diff --git a/components/user_manager/scoped_user_manager.cc b/components/user_manager/scoped_user_manager.cc
index b9a1b1f..6971958 100644
--- a/components/user_manager/scoped_user_manager.cc
+++ b/components/user_manager/scoped_user_manager.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/user_manager/user_manager.h"
namespace user_manager {
diff --git a/components/user_manager/user_info_impl.cc b/components/user_manager/user_info_impl.cc
index ab1ac11..0bb98db5 100644
--- a/components/user_manager/user_info_impl.cc
+++ b/components/user_manager/user_info_impl.cc
@@ -4,7 +4,6 @@
#include "components/user_manager/user_info_impl.h"
-#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
#include "components/account_id/account_id.h"
#include "components/user_manager/user_names.h"
diff --git a/components/user_prefs/user_prefs.cc b/components/user_prefs/user_prefs.cc
index a752c8f..66fc7f1 100644
--- a/components/user_prefs/user_prefs.cc
+++ b/components/user_prefs/user_prefs.cc
@@ -4,7 +4,7 @@
#include "components/user_prefs/user_prefs.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/ptr_util.h"
#include "base/memory/singleton.h"
#include "components/prefs/pref_service.h"
diff --git a/components/variations/entropy_provider.cc b/components/variations/entropy_provider.cc
index 23e040d..e4acb9b 100644
--- a/components/variations/entropy_provider.cc
+++ b/components/variations/entropy_provider.cc
@@ -8,8 +8,8 @@
#include <limits>
#include <vector>
+#include "base/check_op.h"
#include "base/hash/sha1.h"
-#include "base/logging.h"
#include "base/rand_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/sys_byteorder.h"
diff --git a/components/variations/service/ui_string_overrider.cc b/components/variations/service/ui_string_overrider.cc
index 36f7d4b..ce6470a 100644
--- a/components/variations/service/ui_string_overrider.cc
+++ b/components/variations/service/ui_string_overrider.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "base/logging.h"
+#include "base/check.h"
#include "ui/base/resource/resource_bundle.h"
namespace variations {
diff --git a/components/variations/variations_murmur_hash.cc b/components/variations/variations_murmur_hash.cc
index b31229a..1692af8 100644
--- a/components/variations/variations_murmur_hash.cc
+++ b/components/variations/variations_murmur_hash.cc
@@ -6,8 +6,8 @@
#include <string.h>
+#include "base/check_op.h"
#include "base/compiler_specific.h"
-#include "base/logging.h"
#include "base/sys_byteorder.h"
#include "build/build_config.h"
diff --git a/components/version_info/version_info.cc b/components/version_info/version_info.cc
index 57cf7a7..4d71b1b6 100644
--- a/components/version_info/version_info.cc
+++ b/components/version_info/version_info.cc
@@ -4,8 +4,9 @@
#include "components/version_info/version_info.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/no_destructor.h"
+#include "base/notreached.h"
#include "base/sanitizer_buildflags.h"
#include "base/strings/string_number_conversions.h"
#include "base/version.h"
diff --git a/components/visitedlink/common/visitedlink_common.cc b/components/visitedlink/common/visitedlink_common.cc
index aeebf1d2..e06f588 100644
--- a/components/visitedlink/common/visitedlink_common.cc
+++ b/components/visitedlink/common/visitedlink_common.cc
@@ -7,8 +7,9 @@
#include <string.h> // for memset()
#include "base/bit_cast.h"
+#include "base/check.h"
#include "base/hash/md5.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "url/gurl.h"
namespace visitedlink {
diff --git a/components/visitedlink/renderer/visitedlink_reader.cc b/components/visitedlink/renderer/visitedlink_reader.cc
index 855977c..6cd7f77b0 100644
--- a/components/visitedlink/renderer/visitedlink_reader.cc
+++ b/components/visitedlink/renderer/visitedlink_reader.cc
@@ -8,7 +8,7 @@
#include <stdint.h>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "third_party/blink/public/web/web_view.h"
using blink::WebView;
diff --git a/components/viz/client/frame_eviction_manager.cc b/components/viz/client/frame_eviction_manager.cc
index dd49cd9..3a5c8cb 100644
--- a/components/viz/client/frame_eviction_manager.cc
+++ b/components/viz/client/frame_eviction_manager.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/memory_pressure_listener.h"
#include "base/memory/memory_pressure_monitor.h"
#include "base/stl_util.h"
diff --git a/components/viz/client/frame_evictor.cc b/components/viz/client/frame_evictor.cc
index 1ee0aea..ae02539 100644
--- a/components/viz/client/frame_evictor.cc
+++ b/components/viz/client/frame_evictor.cc
@@ -4,7 +4,6 @@
#include "components/viz/client/frame_evictor.h"
-#include "base/logging.h"
namespace viz {
diff --git a/components/viz/common/frame_sinks/begin_frame_source.cc b/components/viz/common/frame_sinks/begin_frame_source.cc
index 6cb4ea8..b3ca047 100644
--- a/components/viz/common/frame_sinks/begin_frame_source.cc
+++ b/components/viz/common/frame_sinks/begin_frame_source.cc
@@ -8,8 +8,9 @@
#include "base/atomic_sequence_num.h"
#include "base/auto_reset.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/trace_event/trace_event.h"
diff --git a/components/viz/common/frame_sinks/copy_output_request.cc b/components/viz/common/frame_sinks/copy_output_request.cc
index f526d05..1e3bffb5 100644
--- a/components/viz/common/frame_sinks/copy_output_request.cc
+++ b/components/viz/common/frame_sinks/copy_output_request.cc
@@ -5,7 +5,7 @@
#include "components/viz/common/frame_sinks/copy_output_request.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/trace_event/trace_event.h"
#include "components/viz/common/frame_sinks/copy_output_result.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/components/viz/common/frame_sinks/copy_output_result.cc b/components/viz/common/frame_sinks/copy_output_result.cc
index 54fad11..2bc45283 100644
--- a/components/viz/common/frame_sinks/copy_output_result.cc
+++ b/components/viz/common/frame_sinks/copy_output_result.cc
@@ -4,7 +4,8 @@
#include "components/viz/common/frame_sinks/copy_output_result.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "third_party/libyuv/include/libyuv.h"
#include "ui/gfx/color_space.h"
diff --git a/components/viz/common/frame_sinks/copy_output_util.cc b/components/viz/common/frame_sinks/copy_output_util.cc
index 30ff3bd2..fba3c71 100644
--- a/components/viz/common/frame_sinks/copy_output_util.cc
+++ b/components/viz/common/frame_sinks/copy_output_util.cc
@@ -6,7 +6,7 @@
#include <stdint.h>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/vector2d.h"
diff --git a/components/viz/common/frame_sinks/delay_based_time_source.cc b/components/viz/common/frame_sinks/delay_based_time_source.cc
index ca62a61..57d46bd 100644
--- a/components/viz/common/frame_sinks/delay_based_time_source.cc
+++ b/components/viz/common/frame_sinks/delay_based_time_source.cc
@@ -9,8 +9,8 @@
#include <string>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/single_thread_task_runner.h"
#include "base/trace_event/trace_event.h"
#include "base/trace_event/traced_value.h"
diff --git a/components/viz/common/gpu/context_cache_controller.cc b/components/viz/common/gpu/context_cache_controller.cc
index 08c1b960..90289935 100644
--- a/components/viz/common/gpu/context_cache_controller.cc
+++ b/components/viz/common/gpu/context_cache_controller.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ptr_util.h"
#include "base/synchronization/lock.h"
#include "gpu/command_buffer/client/context_support.h"
diff --git a/components/viz/common/gpu/context_lost_reason.cc b/components/viz/common/gpu/context_lost_reason.cc
index 7f24e8f..e0ae2fe2 100644
--- a/components/viz/common/gpu/context_lost_reason.cc
+++ b/components/viz/common/gpu/context_lost_reason.cc
@@ -4,7 +4,7 @@
#include "components/viz/common/gpu/context_lost_reason.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace viz {
diff --git a/components/viz/common/gpu/dawn_context_provider.cc b/components/viz/common/gpu/dawn_context_provider.cc
index 0b275a8..50a6bca 100644
--- a/components/viz/common/gpu/dawn_context_provider.cc
+++ b/components/viz/common/gpu/dawn_context_provider.cc
@@ -4,8 +4,9 @@
#include "components/viz/common/gpu/dawn_context_provider.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ptr_util.h"
+#include "base/notreached.h"
#include "build/build_config.h"
#include "third_party/dawn/src/include/dawn/dawn_proc.h"
diff --git a/components/viz/common/quads/content_draw_quad_base.cc b/components/viz/common/quads/content_draw_quad_base.cc
index e127fb79..4171372 100644
--- a/components/viz/common/quads/content_draw_quad_base.cc
+++ b/components/viz/common/quads/content_draw_quad_base.cc
@@ -4,7 +4,6 @@
#include "components/viz/common/quads/content_draw_quad_base.h"
-#include "base/logging.h"
#include "base/trace_event/traced_value.h"
#include "base/values.h"
#include "cc/base/math_util.h"
diff --git a/components/viz/common/quads/debug_border_draw_quad.cc b/components/viz/common/quads/debug_border_draw_quad.cc
index 08d0a06b..2b623212 100644
--- a/components/viz/common/quads/debug_border_draw_quad.cc
+++ b/components/viz/common/quads/debug_border_draw_quad.cc
@@ -4,7 +4,7 @@
#include "components/viz/common/quads/debug_border_draw_quad.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/trace_event/traced_value.h"
#include "ui/gfx/color_utils.h"
diff --git a/components/viz/common/quads/draw_quad.cc b/components/viz/common/quads/draw_quad.cc
index b5177a20..a0b0255 100644
--- a/components/viz/common/quads/draw_quad.cc
+++ b/components/viz/common/quads/draw_quad.cc
@@ -6,7 +6,7 @@
#include <stddef.h>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/trace_event/traced_value.h"
#include "base/values.h"
#include "cc/base/math_util.h"
diff --git a/components/viz/common/quads/solid_color_draw_quad.cc b/components/viz/common/quads/solid_color_draw_quad.cc
index 5f0c8e0..ab495ff 100644
--- a/components/viz/common/quads/solid_color_draw_quad.cc
+++ b/components/viz/common/quads/solid_color_draw_quad.cc
@@ -4,7 +4,7 @@
#include "components/viz/common/quads/solid_color_draw_quad.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/trace_event/traced_value.h"
#include "ui/gfx/color_utils.h"
diff --git a/components/viz/common/quads/stream_video_draw_quad.cc b/components/viz/common/quads/stream_video_draw_quad.cc
index 09990adb..95f3718 100644
--- a/components/viz/common/quads/stream_video_draw_quad.cc
+++ b/components/viz/common/quads/stream_video_draw_quad.cc
@@ -4,7 +4,7 @@
#include "components/viz/common/quads/stream_video_draw_quad.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/trace_event/traced_value.h"
#include "base/values.h"
#include "cc/base/math_util.h"
diff --git a/components/viz/common/quads/surface_draw_quad.cc b/components/viz/common/quads/surface_draw_quad.cc
index 72c9fd6..833c1dc 100644
--- a/components/viz/common/quads/surface_draw_quad.cc
+++ b/components/viz/common/quads/surface_draw_quad.cc
@@ -4,7 +4,7 @@
#include "components/viz/common/quads/surface_draw_quad.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/optional.h"
#include "base/trace_event/traced_value.h"
#include "base/values.h"
diff --git a/components/viz/common/quads/texture_draw_quad.cc b/components/viz/common/quads/texture_draw_quad.cc
index bd394d68..57afe09a 100644
--- a/components/viz/common/quads/texture_draw_quad.cc
+++ b/components/viz/common/quads/texture_draw_quad.cc
@@ -6,7 +6,7 @@
#include <stddef.h>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/trace_event/traced_value.h"
#include "cc/base/math_util.h"
#include "ui/gfx/color_utils.h"
diff --git a/components/viz/common/quads/tile_draw_quad.cc b/components/viz/common/quads/tile_draw_quad.cc
index c7d1c8a..521077f4 100644
--- a/components/viz/common/quads/tile_draw_quad.cc
+++ b/components/viz/common/quads/tile_draw_quad.cc
@@ -4,7 +4,7 @@
#include "components/viz/common/quads/tile_draw_quad.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/trace_event/traced_value.h"
#include "base/values.h"
diff --git a/components/viz/common/quads/yuv_video_draw_quad.cc b/components/viz/common/quads/yuv_video_draw_quad.cc
index 60bf4fb..c6ff62a 100644
--- a/components/viz/common/quads/yuv_video_draw_quad.cc
+++ b/components/viz/common/quads/yuv_video_draw_quad.cc
@@ -4,7 +4,7 @@
#include "components/viz/common/quads/yuv_video_draw_quad.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/trace_event/traced_value.h"
#include "base/values.h"
#include "cc/base/math_util.h"
diff --git a/components/viz/common/resources/resource_format_utils.cc b/components/viz/common/resources/resource_format_utils.cc
index ddaea4c..1c66f51 100644
--- a/components/viz/common/resources/resource_format_utils.cc
+++ b/components/viz/common/resources/resource_format_utils.cc
@@ -4,7 +4,8 @@
#include "components/viz/common/resources/resource_format_utils.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/khronos/GLES2/gl2ext.h"
diff --git a/components/viz/common/resources/resource_sizes_unittest.cc b/components/viz/common/resources/resource_sizes_unittest.cc
index d532f042..37ea7d0 100644
--- a/components/viz/common/resources/resource_sizes_unittest.cc
+++ b/components/viz/common/resources/resource_sizes_unittest.cc
@@ -4,7 +4,6 @@
#include <stddef.h>
-#include "base/logging.h"
#include "components/viz/common/resources/resource_sizes.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/viz/common/resources/shared_bitmap.cc b/components/viz/common/resources/shared_bitmap.cc
index fb54dfd..c5f3955 100644
--- a/components/viz/common/resources/shared_bitmap.cc
+++ b/components/viz/common/resources/shared_bitmap.cc
@@ -7,7 +7,6 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/logging.h"
#include "base/numerics/safe_math.h"
#include "base/rand_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/components/viz/common/resources/single_release_callback.cc b/components/viz/common/resources/single_release_callback.cc
index 1c69ffb..acea576 100644
--- a/components/viz/common/resources/single_release_callback.cc
+++ b/components/viz/common/resources/single_release_callback.cc
@@ -5,7 +5,7 @@
#include "components/viz/common/resources/single_release_callback.h"
#include "base/callback_helpers.h"
-#include "base/logging.h"
+#include "base/check.h"
namespace viz {
diff --git a/components/viz/common/surfaces/surface_range_unittest.cc b/components/viz/common/surfaces/surface_range_unittest.cc
index 54a9b77..0183644c 100644
--- a/components/viz/common/surfaces/surface_range_unittest.cc
+++ b/components/viz/common/surfaces/surface_range_unittest.cc
@@ -5,7 +5,6 @@
#include "components/viz/common/surfaces/surface_range.h"
#include "components/viz/common/surfaces/surface_id.h"
-#include "base/logging.h"
#include "testing/gtest/include/gtest/gtest.h"
// Verifies that SurfaceId::IsInRangeExclusive and SurfaceId::IsInRangeInclusive
diff --git a/components/viz/service/display/display_resource_provider_unittest.cc b/components/viz/service/display/display_resource_provider_unittest.cc
index 2171efa2..ff4c1f2 100644
--- a/components/viz/service/display/display_resource_provider_unittest.cc
+++ b/components/viz/service/display/display_resource_provider_unittest.cc
@@ -16,7 +16,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/memory/ref_counted.h"
#include "base/memory/shared_memory_mapping.h"
diff --git a/components/viz/service/display/display_scheduler_unittest.cc b/components/viz/service/display/display_scheduler_unittest.cc
index fc42994f..4271f4c 100644
--- a/components/viz/service/display/display_scheduler_unittest.cc
+++ b/components/viz/service/display/display_scheduler_unittest.cc
@@ -4,7 +4,7 @@
#include "components/viz/service/display/display_scheduler.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/stl_util.h"
#include "base/test/null_task_runner.h"
#include "base/test/simple_test_tick_clock.h"
diff --git a/components/viz/service/display/external_use_client.cc b/components/viz/service/display/external_use_client.cc
index 0a36f97e..31d4e592 100644
--- a/components/viz/service/display/external_use_client.cc
+++ b/components/viz/service/display/external_use_client.cc
@@ -3,7 +3,8 @@
// found in the LICENSE file.
#include "components/viz/service/display/external_use_client.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
namespace viz {
diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
index 085dbe8..1efef99 100644
--- a/components/viz/service/display/gl_renderer.cc
+++ b/components/viz/service/display/gl_renderer.cc
@@ -18,9 +18,10 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check_op.h"
#include "base/feature_list.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
diff --git a/components/viz/service/display/layer_quad.cc b/components/viz/service/display/layer_quad.cc
index 0385b5d..d7349d8 100644
--- a/components/viz/service/display/layer_quad.cc
+++ b/components/viz/service/display/layer_quad.cc
@@ -6,7 +6,7 @@
#include <stddef.h>
-#include "base/logging.h"
+#include "base/check.h"
#include "ui/gfx/geometry/quad_f.h"
namespace viz {
diff --git a/components/viz/service/display/overlay_candidate.cc b/components/viz/service/display/overlay_candidate.cc
index 2a4aa06..03c45ee 100644
--- a/components/viz/service/display/overlay_candidate.cc
+++ b/components/viz/service/display/overlay_candidate.cc
@@ -7,7 +7,6 @@
#include <algorithm>
#include <limits>
-#include "base/logging.h"
#include "build/build_config.h"
#include "cc/base/math_util.h"
#include "components/viz/common/quads/render_pass_draw_quad.h"
diff --git a/components/viz/service/display/renderer_utils.cc b/components/viz/service/display/renderer_utils.cc
index 7abeb754..098bc93 100644
--- a/components/viz/service/display/renderer_utils.cc
+++ b/components/viz/service/display/renderer_utils.cc
@@ -4,7 +4,6 @@
#include "components/viz/service/display/renderer_utils.h"
-#include "base/logging.h"
#include "third_party/skia/include/core/SkMatrix.h"
#include "third_party/skia/include/core/SkScalar.h"
diff --git a/components/viz/service/display/scoped_gpu_memory_buffer_texture.cc b/components/viz/service/display/scoped_gpu_memory_buffer_texture.cc
index c7a1cb0..2ae1a77 100644
--- a/components/viz/service/display/scoped_gpu_memory_buffer_texture.cc
+++ b/components/viz/service/display/scoped_gpu_memory_buffer_texture.cc
@@ -5,7 +5,7 @@
#include "components/viz/service/display/scoped_gpu_memory_buffer_texture.h"
#include "base/bits.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/stl_util.h"
#include "components/viz/common/gpu/context_provider.h"
#include "components/viz/common/resources/resource_format.h"
diff --git a/components/viz/service/display/scoped_render_pass_texture.cc b/components/viz/service/display/scoped_render_pass_texture.cc
index 7f69f85d..844189b 100644
--- a/components/viz/service/display/scoped_render_pass_texture.cc
+++ b/components/viz/service/display/scoped_render_pass_texture.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include "base/bits.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/viz/common/gpu/context_provider.h"
#include "components/viz/common/resources/resource_format_utils.h"
#include "gpu/GLES2/gl2extchromium.h"
diff --git a/components/viz/service/display/shader.cc b/components/viz/service/display/shader.cc
index 5ee931962..dcec81c 100644
--- a/components/viz/service/display/shader.cc
+++ b/components/viz/service/display/shader.cc
@@ -10,7 +10,8 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/char_traits.h"
#include "base/strings/strcat.h"
#include "base/strings/stringprintf.h"
diff --git a/components/viz/service/display/software_output_device.cc b/components/viz/service/display/software_output_device.cc
index 4efef8d..73e22fb8 100644
--- a/components/viz/service/display/software_output_device.cc
+++ b/components/viz/service/display/software_output_device.cc
@@ -7,7 +7,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "ui/gfx/vsync_provider.h"
diff --git a/components/viz/service/display/surface_aggregator.cc b/components/viz/service/display/surface_aggregator.cc
index 43d34c09..bdd66c70 100644
--- a/components/viz/service/display/surface_aggregator.cc
+++ b/components/viz/service/display/surface_aggregator.cc
@@ -11,8 +11,8 @@
#include "base/auto_reset.h"
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/containers/adapters.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/ranges.h"
diff --git a/components/viz/service/display_embedder/skia_output_device.cc b/components/viz/service/display_embedder/skia_output_device.cc
index 7959ea9..3bec080 100644
--- a/components/viz/service/display_embedder/skia_output_device.cc
+++ b/components/viz/service/display_embedder/skia_output_device.cc
@@ -6,7 +6,8 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "components/viz/service/display/dc_layer_overlay.h"
#include "gpu/command_buffer/service/memory_tracking.h"
#include "third_party/skia/include/core/SkSurface.h"
diff --git a/components/viz/service/display_embedder/skia_output_device_dawn.cc b/components/viz/service/display_embedder/skia_output_device_dawn.cc
index f4fec42..a2bb693 100644
--- a/components/viz/service/display_embedder/skia_output_device_dawn.cc
+++ b/components/viz/service/display_embedder/skia_output_device_dawn.cc
@@ -4,7 +4,8 @@
#include "components/viz/service/display_embedder/skia_output_device_dawn.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "build/build_config.h"
#include "components/viz/common/gpu/dawn_context_provider.h"
#include "ui/gfx/presentation_feedback.h"
diff --git a/components/viz/service/frame_sinks/frame_sink_manager_impl.cc b/components/viz/service/frame_sinks/frame_sink_manager_impl.cc
index 31073425..3dce9a6 100644
--- a/components/viz/service/frame_sinks/frame_sink_manager_impl.cc
+++ b/components/viz/service/frame_sinks/frame_sink_manager_impl.cc
@@ -8,7 +8,7 @@
#include <stdint.h>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_functions.h"
#include "components/viz/service/display/shared_bitmap_manager.h"
#include "components/viz/service/display_embedder/output_surface_provider.h"
diff --git a/components/viz/service/frame_sinks/surface_resource_holder.cc b/components/viz/service/frame_sinks/surface_resource_holder.cc
index 9cb78884..a2da66f 100644
--- a/components/viz/service/frame_sinks/surface_resource_holder.cc
+++ b/components/viz/service/frame_sinks/surface_resource_holder.cc
@@ -4,7 +4,7 @@
#include "components/viz/service/frame_sinks/surface_resource_holder.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "components/viz/service/frame_sinks/surface_resource_holder_client.h"
namespace viz {
diff --git a/components/viz/service/surfaces/referenced_surface_tracker.cc b/components/viz/service/surfaces/referenced_surface_tracker.cc
index e002db81..e9498de 100644
--- a/components/viz/service/surfaces/referenced_surface_tracker.cc
+++ b/components/viz/service/surfaces/referenced_surface_tracker.cc
@@ -4,7 +4,7 @@
#include "components/viz/service/surfaces/referenced_surface_tracker.h"
-#include "base/logging.h"
+#include "base/check.h"
namespace viz {
diff --git a/components/viz/service/surfaces/referenced_surface_tracker_unittest.cc b/components/viz/service/surfaces/referenced_surface_tracker_unittest.cc
index b60a72c..25f55de 100644
--- a/components/viz/service/surfaces/referenced_surface_tracker_unittest.cc
+++ b/components/viz/service/surfaces/referenced_surface_tracker_unittest.cc
@@ -7,7 +7,6 @@
#include <memory>
#include "base/containers/flat_set.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "components/viz/common/surfaces/frame_sink_id.h"
#include "components/viz/common/surfaces/surface_id.h"
diff --git a/components/viz/test/test_context_provider.cc b/components/viz/test/test_context_provider.cc
index cb875c8..855058f 100644
--- a/components/viz/test/test_context_provider.cc
+++ b/components/viz/test/test_context_provider.cc
@@ -15,7 +15,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback_helpers.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "build/build_config.h"
#include "components/viz/common/gpu/context_cache_controller.h"
diff --git a/components/viz/test/test_gpu_memory_buffer_manager.cc b/components/viz/test/test_gpu_memory_buffer_manager.cc
index c5c30e4e..2b75998 100644
--- a/components/viz/test/test_gpu_memory_buffer_manager.cc
+++ b/components/viz/test/test_gpu_memory_buffer_manager.cc
@@ -7,7 +7,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/numerics/safe_conversions.h"
#include "ui/gfx/buffer_format_util.h"
#include "ui/gfx/gpu_memory_buffer.h"
diff --git a/components/web_modal/web_contents_modal_dialog_manager.cc b/components/web_modal/web_contents_modal_dialog_manager.cc
index 5da9b0b..209e09c 100644
--- a/components/web_modal/web_contents_modal_dialog_manager.cc
+++ b/components/web_modal/web_contents_modal_dialog_manager.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
#include "content/public/browser/navigation_handle.h"
#include "content/public/browser/web_contents.h"
diff --git a/components/web_resource/eula_accepted_notifier.cc b/components/web_resource/eula_accepted_notifier.cc
index 8145233..6bfc5a85 100644
--- a/components/web_resource/eula_accepted_notifier.cc
+++ b/components/web_resource/eula_accepted_notifier.cc
@@ -5,7 +5,7 @@
#include "components/web_resource/eula_accepted_notifier.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "build/branding_buildflags.h"
#include "build/build_config.h"
#include "components/prefs/pref_service.h"
diff --git a/components/webcrypto/algorithm_dispatch.cc b/components/webcrypto/algorithm_dispatch.cc
index 87058546..9116fbb0 100644
--- a/components/webcrypto/algorithm_dispatch.cc
+++ b/components/webcrypto/algorithm_dispatch.cc
@@ -4,7 +4,6 @@
#include "components/webcrypto/algorithm_dispatch.h"
-#include "base/logging.h"
#include "components/webcrypto/algorithm_implementation.h"
#include "components/webcrypto/algorithm_implementations.h"
#include "components/webcrypto/algorithm_registry.h"
diff --git a/components/webcrypto/algorithms/aes.cc b/components/webcrypto/algorithms/aes.cc
index 34573549..5d121339 100644
--- a/components/webcrypto/algorithms/aes.cc
+++ b/components/webcrypto/algorithms/aes.cc
@@ -6,7 +6,6 @@
#include <stddef.h>
-#include "base/logging.h"
#include "components/webcrypto/algorithms/secret_key_util.h"
#include "components/webcrypto/algorithms/util.h"
#include "components/webcrypto/blink_key_handle.h"
diff --git a/components/webcrypto/algorithms/aes_cbc.cc b/components/webcrypto/algorithms/aes_cbc.cc
index 89fd33a..27e9a2d 100644
--- a/components/webcrypto/algorithms/aes_cbc.cc
+++ b/components/webcrypto/algorithms/aes_cbc.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/numerics/safe_math.h"
#include "components/webcrypto/algorithms/aes.h"
#include "components/webcrypto/algorithms/util.h"
diff --git a/components/webcrypto/algorithms/aes_ctr.cc b/components/webcrypto/algorithms/aes_ctr.cc
index e504da2..0d80be37 100644
--- a/components/webcrypto/algorithms/aes_ctr.cc
+++ b/components/webcrypto/algorithms/aes_ctr.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
#include "base/numerics/safe_math.h"
#include "components/webcrypto/algorithms/aes.h"
diff --git a/components/webcrypto/algorithms/aes_gcm.cc b/components/webcrypto/algorithms/aes_gcm.cc
index dbf1a8f..f75c461 100644
--- a/components/webcrypto/algorithms/aes_gcm.cc
+++ b/components/webcrypto/algorithms/aes_gcm.cc
@@ -8,7 +8,6 @@
#include <memory>
#include <vector>
-#include "base/logging.h"
#include "base/stl_util.h"
#include "components/webcrypto/algorithms/aes.h"
#include "components/webcrypto/algorithms/util.h"
diff --git a/components/webcrypto/algorithms/ec.cc b/components/webcrypto/algorithms/ec.cc
index 4274040..f0be1d3 100644
--- a/components/webcrypto/algorithms/ec.cc
+++ b/components/webcrypto/algorithms/ec.cc
@@ -7,7 +7,6 @@
#include <stddef.h>
#include <utility>
-#include "base/logging.h"
#include "base/stl_util.h"
#include "components/webcrypto/algorithms/asymmetric_key_util.h"
#include "components/webcrypto/algorithms/util.h"
diff --git a/components/webcrypto/algorithms/ecdh.cc b/components/webcrypto/algorithms/ecdh.cc
index e7dba88..208472f 100644
--- a/components/webcrypto/algorithms/ecdh.cc
+++ b/components/webcrypto/algorithms/ecdh.cc
@@ -7,7 +7,6 @@
#include <memory>
-#include "base/logging.h"
#include "components/webcrypto/algorithm_implementation.h"
#include "components/webcrypto/algorithms/ec.h"
#include "components/webcrypto/algorithms/util.h"
diff --git a/components/webcrypto/algorithms/ecdsa.cc b/components/webcrypto/algorithms/ecdsa.cc
index 023202d..00a83c3 100644
--- a/components/webcrypto/algorithms/ecdsa.cc
+++ b/components/webcrypto/algorithms/ecdsa.cc
@@ -7,7 +7,6 @@
#include <memory>
-#include "base/logging.h"
#include "components/webcrypto/algorithm_implementation.h"
#include "components/webcrypto/algorithms/ec.h"
#include "components/webcrypto/algorithms/util.h"
diff --git a/components/webcrypto/algorithms/hkdf.cc b/components/webcrypto/algorithms/hkdf.cc
index 743bda02..abb6b98 100644
--- a/components/webcrypto/algorithms/hkdf.cc
+++ b/components/webcrypto/algorithms/hkdf.cc
@@ -6,7 +6,6 @@
#include <memory>
-#include "base/logging.h"
#include "components/webcrypto/algorithm_implementation.h"
#include "components/webcrypto/algorithms/secret_key_util.h"
#include "components/webcrypto/algorithms/util.h"
diff --git a/components/webcrypto/algorithms/hmac.cc b/components/webcrypto/algorithms/hmac.cc
index 027333a..0049cdc 100644
--- a/components/webcrypto/algorithms/hmac.cc
+++ b/components/webcrypto/algorithms/hmac.cc
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/numerics/safe_math.h"
#include "components/webcrypto/algorithm_implementation.h"
#include "components/webcrypto/algorithms/secret_key_util.h"
diff --git a/components/webcrypto/algorithms/hmac_unittest.cc b/components/webcrypto/algorithms/hmac_unittest.cc
index 175bbe7d..b61e506 100644
--- a/components/webcrypto/algorithms/hmac_unittest.cc
+++ b/components/webcrypto/algorithms/hmac_unittest.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/values.h"
#include "components/webcrypto/algorithm_dispatch.h"
#include "components/webcrypto/algorithms/test_helpers.h"
diff --git a/components/webcrypto/algorithms/rsa.cc b/components/webcrypto/algorithms/rsa.cc
index 8fba98e1..0227d0c 100644
--- a/components/webcrypto/algorithms/rsa.cc
+++ b/components/webcrypto/algorithms/rsa.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/webcrypto/algorithms/asymmetric_key_util.h"
#include "components/webcrypto/algorithms/util.h"
#include "components/webcrypto/blink_key_handle.h"
diff --git a/components/webcrypto/algorithms/rsa_oaep_unittest.cc b/components/webcrypto/algorithms/rsa_oaep_unittest.cc
index fcceed5..cd3be74 100644
--- a/components/webcrypto/algorithms/rsa_oaep_unittest.cc
+++ b/components/webcrypto/algorithms/rsa_oaep_unittest.cc
@@ -6,7 +6,6 @@
#include <stdint.h>
#include "base/base64url.h"
-#include "base/logging.h"
#include "base/stl_util.h"
#include "components/webcrypto/algorithm_dispatch.h"
#include "components/webcrypto/algorithms/test_helpers.h"
diff --git a/components/webcrypto/algorithms/rsa_pss_unittest.cc b/components/webcrypto/algorithms/rsa_pss_unittest.cc
index f4af3f1..5f917e2 100644
--- a/components/webcrypto/algorithms/rsa_pss_unittest.cc
+++ b/components/webcrypto/algorithms/rsa_pss_unittest.cc
@@ -5,7 +5,6 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/logging.h"
#include "base/stl_util.h"
#include "components/webcrypto/algorithm_dispatch.h"
#include "components/webcrypto/algorithms/test_helpers.h"
diff --git a/components/webcrypto/algorithms/rsa_ssa_unittest.cc b/components/webcrypto/algorithms/rsa_ssa_unittest.cc
index 35dff52..d9009c3c 100644
--- a/components/webcrypto/algorithms/rsa_ssa_unittest.cc
+++ b/components/webcrypto/algorithms/rsa_ssa_unittest.cc
@@ -5,7 +5,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/stl_util.h"
#include "base/values.h"
#include "components/webcrypto/algorithm_dispatch.h"
diff --git a/components/webcrypto/algorithms/sha.cc b/components/webcrypto/algorithms/sha.cc
index 1b44bf5b60..efb32a1 100644
--- a/components/webcrypto/algorithms/sha.cc
+++ b/components/webcrypto/algorithms/sha.cc
@@ -6,7 +6,7 @@
#include <vector>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/webcrypto/algorithm_implementation.h"
#include "components/webcrypto/algorithms/util.h"
#include "components/webcrypto/crypto_data.h"
diff --git a/components/webcrypto/algorithms/sha_unittest.cc b/components/webcrypto/algorithms/sha_unittest.cc
index 80ec9ae..6d2896f 100644
--- a/components/webcrypto/algorithms/sha_unittest.cc
+++ b/components/webcrypto/algorithms/sha_unittest.cc
@@ -5,7 +5,6 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/logging.h"
#include "base/values.h"
#include "components/webcrypto/algorithm_dispatch.h"
#include "components/webcrypto/algorithms/test_helpers.h"
diff --git a/components/webcrypto/algorithms/test_helpers.cc b/components/webcrypto/algorithms/test_helpers.cc
index 4ca7898a..c981141e 100644
--- a/components/webcrypto/algorithms/test_helpers.cc
+++ b/components/webcrypto/algorithms/test_helpers.cc
@@ -9,10 +9,10 @@
#include <algorithm>
#include "base/base64url.h"
+#include "base/check.h"
#include "base/files/file_util.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
-#include "base/logging.h"
#include "base/path_service.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/components/webcrypto/algorithms/util.cc b/components/webcrypto/algorithms/util.cc
index 658f3612..557e6cc55 100644
--- a/components/webcrypto/algorithms/util.cc
+++ b/components/webcrypto/algorithms/util.cc
@@ -4,7 +4,7 @@
#include "components/webcrypto/algorithms/util.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/webcrypto/crypto_data.h"
#include "components/webcrypto/status.h"
#include "crypto/openssl_util.h"
diff --git a/components/webcrypto/blink_key_handle.cc b/components/webcrypto/blink_key_handle.cc
index 45a397d..1e78b36 100644
--- a/components/webcrypto/blink_key_handle.cc
+++ b/components/webcrypto/blink_key_handle.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
#include "components/webcrypto/crypto_data.h"
#include "components/webcrypto/status.h"
diff --git a/components/webcrypto/generate_key_result.cc b/components/webcrypto/generate_key_result.cc
index 63b4050d..b761d603 100644
--- a/components/webcrypto/generate_key_result.cc
+++ b/components/webcrypto/generate_key_result.cc
@@ -4,7 +4,8 @@
#include "components/webcrypto/generate_key_result.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
namespace webcrypto {
diff --git a/components/webcrypto/webcrypto_impl.cc b/components/webcrypto/webcrypto_impl.cc
index 63456db2..e2662c6 100644
--- a/components/webcrypto/webcrypto_impl.cc
+++ b/components/webcrypto/webcrypto_impl.cc
@@ -11,9 +11,9 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/lazy_instance.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/single_thread_task_runner.h"
#include "base/task_runner.h"
diff --git a/components/webrtc_logging/common/partial_circular_buffer.cc b/components/webrtc_logging/common/partial_circular_buffer.cc
index 10a0c5e7..90a7854b 100644
--- a/components/webrtc_logging/common/partial_circular_buffer.cc
+++ b/components/webrtc_logging/common/partial_circular_buffer.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "base/logging.h"
+#include "base/check_op.h"
namespace webrtc_logging {
diff --git a/components/zucchini/abs32_utils.cc b/components/zucchini/abs32_utils.cc
index 91bdb61..5d3d6ea8 100644
--- a/components/zucchini/abs32_utils.cc
+++ b/components/zucchini/abs32_utils.cc
@@ -8,7 +8,7 @@
#include <type_traits>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/zucchini/io_utils.h"
namespace zucchini {
diff --git a/components/zucchini/algorithm_unittest.cc b/components/zucchini/algorithm_unittest.cc
index ad5b9b8..2e1f94d 100644
--- a/components/zucchini/algorithm_unittest.cc
+++ b/components/zucchini/algorithm_unittest.cc
@@ -7,7 +7,6 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/logging.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace zucchini {
diff --git a/components/zucchini/arm_utils_unittest.cc b/components/zucchini/arm_utils_unittest.cc
index 2b669d04..56aa1f9 100644
--- a/components/zucchini/arm_utils_unittest.cc
+++ b/components/zucchini/arm_utils_unittest.cc
@@ -15,7 +15,7 @@
#include <string>
#include <vector>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/zucchini/address_translator.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/zucchini/binary_data_histogram.cc b/components/zucchini/binary_data_histogram.cc
index 785e8ea..7f6ece8 100644
--- a/components/zucchini/binary_data_histogram.cc
+++ b/components/zucchini/binary_data_histogram.cc
@@ -8,8 +8,8 @@
#include <cmath>
#include <limits>
+#include "base/check_op.h"
#include "base/format_macros.h"
-#include "base/logging.h"
#include "base/strings/stringprintf.h"
namespace zucchini {
diff --git a/components/zucchini/crc32.cc b/components/zucchini/crc32.cc
index 8a40296..1c45dfe 100644
--- a/components/zucchini/crc32.cc
+++ b/components/zucchini/crc32.cc
@@ -6,7 +6,7 @@
#include <array>
-#include "base/logging.h"
+#include "base/check_op.h"
namespace zucchini {
diff --git a/components/zucchini/disassembler.cc b/components/zucchini/disassembler.cc
index 897d949..0411791 100644
--- a/components/zucchini/disassembler.cc
+++ b/components/zucchini/disassembler.cc
@@ -4,7 +4,7 @@
#include "components/zucchini/disassembler.h"
-#include "base/logging.h"
+#include "base/check_op.h"
namespace zucchini {
diff --git a/components/zucchini/disassembler_ztf.cc b/components/zucchini/disassembler_ztf.cc
index 62e3ed4..c54a7b0 100644
--- a/components/zucchini/disassembler_ztf.cc
+++ b/components/zucchini/disassembler_ztf.cc
@@ -10,7 +10,7 @@
#include <limits>
#include <numeric>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
#include "base/numerics/checked_math.h"
#include "base/numerics/safe_conversions.h"
diff --git a/components/zucchini/disassembler_ztf_unittest.cc b/components/zucchini/disassembler_ztf_unittest.cc
index 1e71359..81891da2 100644
--- a/components/zucchini/disassembler_ztf_unittest.cc
+++ b/components/zucchini/disassembler_ztf_unittest.cc
@@ -13,7 +13,6 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/string_piece.h"
#include "components/zucchini/buffer_view.h"
diff --git a/components/zucchini/element_detection.cc b/components/zucchini/element_detection.cc
index d4347c5..bec16be 100644
--- a/components/zucchini/element_detection.cc
+++ b/components/zucchini/element_detection.cc
@@ -6,7 +6,6 @@
#include <utility>
-#include "base/logging.h"
#include "components/zucchini/buildflags.h"
#include "components/zucchini/disassembler.h"
#include "components/zucchini/disassembler_no_op.h"
diff --git a/components/zucchini/encoded_view.cc b/components/zucchini/encoded_view.cc
index 90eeba9..205603f 100644
--- a/components/zucchini/encoded_view.cc
+++ b/components/zucchini/encoded_view.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
namespace zucchini {
diff --git a/components/zucchini/image_utils_unittest.cc b/components/zucchini/image_utils_unittest.cc
index 81695e9..2cf64552 100644
--- a/components/zucchini/image_utils_unittest.cc
+++ b/components/zucchini/image_utils_unittest.cc
@@ -4,7 +4,6 @@
#include "components/zucchini/image_utils.h"
-#include "base/logging.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace zucchini {
diff --git a/components/zucchini/imposed_ensemble_matcher_unittest.cc b/components/zucchini/imposed_ensemble_matcher_unittest.cc
index 97a8898c..f3bb277 100644
--- a/components/zucchini/imposed_ensemble_matcher_unittest.cc
+++ b/components/zucchini/imposed_ensemble_matcher_unittest.cc
@@ -13,7 +13,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/optional.h"
#include "components/zucchini/buffer_view.h"
#include "components/zucchini/disassembler.h"
diff --git a/components/zucchini/io_utils_unittest.cc b/components/zucchini/io_utils_unittest.cc
index f3e82ec7..521e7ce 100644
--- a/components/zucchini/io_utils_unittest.cc
+++ b/components/zucchini/io_utils_unittest.cc
@@ -9,7 +9,6 @@
#include <sstream>
#include <string>
-#include "base/logging.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace zucchini {
diff --git a/components/zucchini/mapped_file.cc b/components/zucchini/mapped_file.cc
index 497b42a1..2ea973c 100644
--- a/components/zucchini/mapped_file.cc
+++ b/components/zucchini/mapped_file.cc
@@ -7,7 +7,6 @@
#include <utility>
#include "base/files/file_util.h"
-#include "base/logging.h"
#include "build/build_config.h"
namespace zucchini {
diff --git a/components/zucchini/reference_bytes_mixer.cc b/components/zucchini/reference_bytes_mixer.cc
index a073a6a..d6edd3a 100644
--- a/components/zucchini/reference_bytes_mixer.cc
+++ b/components/zucchini/reference_bytes_mixer.cc
@@ -4,7 +4,8 @@
#include "components/zucchini/reference_bytes_mixer.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "components/zucchini/disassembler.h"
namespace zucchini {
diff --git a/components/zucchini/reference_set.cc b/components/zucchini/reference_set.cc
index 0179a51..14d4e54 100644
--- a/components/zucchini/reference_set.cc
+++ b/components/zucchini/reference_set.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <iterator>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
#include "components/zucchini/target_pool.h"
diff --git a/components/zucchini/rel32_finder_unittest.cc b/components/zucchini/rel32_finder_unittest.cc
index c32f814..9da88bf 100644
--- a/components/zucchini/rel32_finder_unittest.cc
+++ b/components/zucchini/rel32_finder_unittest.cc
@@ -13,8 +13,8 @@
#include <utility>
#include <vector>
+#include "base/check_op.h"
#include "base/format_macros.h"
-#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "components/zucchini/buffer_view.h"
#include "components/zucchini/image_utils.h"
diff --git a/components/zucchini/rel32_utils.cc b/components/zucchini/rel32_utils.cc
index 2d42975..37bcb6f4 100644
--- a/components/zucchini/rel32_utils.cc
+++ b/components/zucchini/rel32_utils.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/zucchini/io_utils.h"
namespace zucchini {
diff --git a/components/zucchini/reloc_win32_unittest.cc b/components/zucchini/reloc_win32_unittest.cc
index eaf55e1..1b9894f3 100644
--- a/components/zucchini/reloc_win32_unittest.cc
+++ b/components/zucchini/reloc_win32_unittest.cc
@@ -12,7 +12,6 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/test/gtest_util.h"
#include "components/zucchini/address_translator.h"
diff --git a/components/zucchini/target_pool.cc b/components/zucchini/target_pool.cc
index 0c1e0a5..23551fd 100644
--- a/components/zucchini/target_pool.cc
+++ b/components/zucchini/target_pool.cc
@@ -8,7 +8,7 @@
#include <iterator>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "components/zucchini/algorithm.h"
#include "components/zucchini/equivalence_map.h"
diff --git a/components/zucchini/targets_affinity.cc b/components/zucchini/targets_affinity.cc
index 11903a9..d0837877 100644
--- a/components/zucchini/targets_affinity.cc
+++ b/components/zucchini/targets_affinity.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "components/zucchini/equivalence_map.h"
namespace zucchini {
diff --git a/components/zucchini/test_utils.cc b/components/zucchini/test_utils.cc
index 91c8a39..bc912b4 100644
--- a/components/zucchini/test_utils.cc
+++ b/components/zucchini/test_utils.cc
@@ -7,7 +7,7 @@
#include <ios>
#include <sstream>
-#include "base/logging.h"
+#include "base/check_op.h"
namespace zucchini {
diff --git a/components/zucchini/zucchini_tools.cc b/components/zucchini/zucchini_tools.cc
index 5fcf0667..e8bf73459a 100644
--- a/components/zucchini/zucchini_tools.cc
+++ b/components/zucchini/zucchini_tools.cc
@@ -13,7 +13,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/stringprintf.h"
#include "components/zucchini/disassembler.h"
#include "components/zucchini/element_detection.h"
