Remove/replace unnecessary logging.h includes in .cc files (net)
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: Ia3fbf74ab31096a4b066735e46966be9e9f92e0d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2164832
Auto-Submit: Hans Wennborg <hans@chromium.org>
Commit-Queue: Matt Menke <mmenke@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#763009}
diff --git a/net/android/keystore.cc b/net/android/keystore.cc
index a3e577f..b6f2722a9 100644
--- a/net/android/keystore.cc
+++ b/net/android/keystore.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 "net/net_jni_headers/AndroidKeyStore_jni.h"
using base::android::AttachCurrentThread;
diff --git a/net/android/network_change_notifier_delegate_android.cc b/net/android/network_change_notifier_delegate_android.cc
index b5fbd2f0..e6e0dac 100644
--- a/net/android/network_change_notifier_delegate_android.cc
+++ b/net/android/network_change_notifier_delegate_android.cc
@@ -5,7 +5,8 @@
#include "net/android/network_change_notifier_delegate_android.h"
#include "base/android/jni_array.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "net/android/network_change_notifier_android.h"
#include "net/net_jni_headers/NetworkChangeNotifier_jni.h"
diff --git a/net/android/network_library.cc b/net/android/network_library.cc
index 5b9ac4e..0df97016a 100644
--- a/net/android/network_library.cc
+++ b/net/android/network_library.cc
@@ -8,7 +8,7 @@
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/dns/public/dns_protocol.h"
#include "net/net_jni_headers/AndroidNetworkLibrary_jni.h"
#include "net/net_jni_headers/DnsStatus_jni.h"
diff --git a/net/base/address_family.cc b/net/base/address_family.cc
index deff1157..6e0bc67 100644
--- a/net/base/address_family.cc
+++ b/net/base/address_family.cc
@@ -4,7 +4,7 @@
#include "net/base/address_family.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "net/base/ip_address.h"
#include "net/base/sys_addrinfo.h"
diff --git a/net/base/backoff_entry.cc b/net/base/backoff_entry.cc
index db70d42..c0307bf 100644
--- a/net/base/backoff_entry.cc
+++ b/net/base/backoff_entry.cc
@@ -8,7 +8,7 @@
#include <cmath>
#include <limits>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/numerics/safe_math.h"
#include "base/rand_util.h"
#include "base/time/tick_clock.h"
diff --git a/net/base/backoff_entry_serializer_unittest.cc b/net/base/backoff_entry_serializer_unittest.cc
index 748e226..8fcf654 100644
--- a/net/base/backoff_entry_serializer_unittest.cc
+++ b/net/base/backoff_entry_serializer_unittest.cc
@@ -4,7 +4,6 @@
#include "net/base/backoff_entry.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/time/tick_clock.h"
#include "base/values.h"
diff --git a/net/base/chunked_upload_data_stream.cc b/net/base/chunked_upload_data_stream.cc
index f4db7d7..a3a63d9 100644
--- a/net/base/chunked_upload_data_stream.cc
+++ b/net/base/chunked_upload_data_stream.cc
@@ -4,7 +4,7 @@
#include "net/base/chunked_upload_data_stream.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ptr_util.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
diff --git a/net/base/data_url_fuzzer.cc b/net/base/data_url_fuzzer.cc
index 237c794..39afc038 100644
--- a/net/base/data_url_fuzzer.cc
+++ b/net/base/data_url_fuzzer.cc
@@ -11,7 +11,7 @@
#include <string>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ref_counted.h"
#include "net/base/net_errors.h"
#include "net/http/http_response_headers.h"
diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc
index 046a1b3..acab43d 100644
--- a/net/base/directory_lister.cc
+++ b/net/base/directory_lister.cc
@@ -8,11 +8,12 @@
#include <utility>
#include "base/bind.h"
+#include "base/check.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_util.h"
#include "base/i18n/file_util_icu.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/task/post_task.h"
#include "base/task/thread_pool.h"
#include "base/task_runner.h"
diff --git a/net/base/elements_upload_data_stream.cc b/net/base/elements_upload_data_stream.cc
index 5cc6590..70b9e2bf 100644
--- a/net/base/elements_upload_data_stream.cc
+++ b/net/base/elements_upload_data_stream.cc
@@ -5,7 +5,7 @@
#include "net/base/elements_upload_data_stream.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/base/upload_bytes_element_reader.h"
diff --git a/net/base/escape.cc b/net/base/escape.cc
index 7675c71..94cee5b 100644
--- a/net/base/escape.cc
+++ b/net/base/escape.cc
@@ -4,7 +4,7 @@
#include "net/base/escape.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversion_utils.h"
diff --git a/net/base/file_stream_context_posix.cc b/net/base/file_stream_context_posix.cc
index b8c805ea..17af1b94 100644
--- a/net/base/file_stream_context_posix.cc
+++ b/net/base/file_stream_context_posix.cc
@@ -10,9 +10,9 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
+#include "base/check.h"
#include "base/files/file_path.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/posix/eintr_wrapper.h"
#include "base/task_runner.h"
#include "base/task_runner_util.h"
diff --git a/net/base/hash_value.cc b/net/base/hash_value.cc
index db59cfd4f1..c4af8d5 100644
--- a/net/base/hash_value.cc
+++ b/net/base/hash_value.cc
@@ -8,7 +8,8 @@
#include <algorithm>
#include "base/base64.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "crypto/sha2.h"
diff --git a/net/base/host_port_pair_unittest.cc b/net/base/host_port_pair_unittest.cc
index 4300c2b..1f9a9f9 100644
--- a/net/base/host_port_pair_unittest.cc
+++ b/net/base/host_port_pair_unittest.cc
@@ -4,7 +4,6 @@
#include "net/base/host_port_pair.h"
-#include "base/logging.h"
#include "net/test/gtest_util.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/base/interval_test.cc b/net/base/interval_test.cc
index 2ee6dc1..25ff71a 100644
--- a/net/base/interval_test.cc
+++ b/net/base/interval_test.cc
@@ -11,7 +11,6 @@
#include "net/base/interval.h"
-#include "base/logging.h"
#include "net/test/gtest_util.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/base/io_buffer.cc b/net/base/io_buffer.cc
index 429dbc09..b3c61df3 100644
--- a/net/base/io_buffer.cc
+++ b/net/base/io_buffer.cc
@@ -4,7 +4,7 @@
#include "net/base/io_buffer.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/numerics/safe_math.h"
namespace net {
diff --git a/net/base/ip_address.cc b/net/base/ip_address.cc
index efc58ed..03a4df02 100644
--- a/net/base/ip_address.cc
+++ b/net/base/ip_address.cc
@@ -7,8 +7,9 @@
#include <algorithm>
#include <climits>
+#include "base/check_op.h"
#include "base/containers/stack_container.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/strcat.h"
#include "base/strings/string_piece.h"
diff --git a/net/base/ip_endpoint.cc b/net/base/ip_endpoint.cc
index 3d81539..749d872e 100644
--- a/net/base/ip_endpoint.cc
+++ b/net/base/ip_endpoint.cc
@@ -17,7 +17,8 @@
#include <tuple>
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/sys_byteorder.h"
#include "net/base/ip_address.h"
diff --git a/net/base/ip_endpoint_unittest.cc b/net/base/ip_endpoint_unittest.cc
index a2220bf..f0f7eab 100644
--- a/net/base/ip_endpoint_unittest.cc
+++ b/net/base/ip_endpoint_unittest.cc
@@ -12,7 +12,8 @@
#include <netinet/in.h>
#endif
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/sys_byteorder.h"
#include "net/base/sockaddr_storage.h"
diff --git a/net/base/isolation_info.cc b/net/base/isolation_info.cc
index 38a4b655..0fda145 100644
--- a/net/base/isolation_info.cc
+++ b/net/base/isolation_info.cc
@@ -4,7 +4,7 @@
#include "net/base/isolation_info.h"
-#include "base/logging.h"
+#include "base/check_op.h"
namespace net {
diff --git a/net/base/lookup_string_in_fixed_set.cc b/net/base/lookup_string_in_fixed_set.cc
index a6df9aed..b726fb9 100644
--- a/net/base/lookup_string_in_fixed_set.cc
+++ b/net/base/lookup_string_in_fixed_set.cc
@@ -4,7 +4,7 @@
#include "net/base/lookup_string_in_fixed_set.h"
-#include "base/logging.h"
+#include "base/check.h"
namespace net {
diff --git a/net/base/mime_sniffer.cc b/net/base/mime_sniffer.cc
index bc1f1eb..acb1eba 100644
--- a/net/base/mime_sniffer.cc
+++ b/net/base/mime_sniffer.cc
@@ -88,8 +88,9 @@
#include "net/base/mime_sniffer.h"
+#include "base/check_op.h"
#include "base/containers/span.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "url/gurl.h"
diff --git a/net/base/mime_sniffer_perftest.cc b/net/base/mime_sniffer_perftest.cc
index 69b483f..9de39b7 100644
--- a/net/base/mime_sniffer_perftest.cc
+++ b/net/base/mime_sniffer_perftest.cc
@@ -7,7 +7,7 @@
#include <vector>
#include "base/bits.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/timer/elapsed_timer.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/perf/perf_result_reporter.h"
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index caf408f..357006b1 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -9,9 +9,9 @@
#include <unordered_set>
#include "base/base64.h"
+#include "base/check_op.h"
#include "base/containers/span.h"
#include "base/lazy_instance.h"
-#include "base/logging.h"
#include "base/rand_util.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/base/net_errors.cc b/net/base/net_errors.cc
index e1561d14..25d46b4 100644
--- a/net/base/net_errors.cc
+++ b/net/base/net_errors.cc
@@ -4,7 +4,8 @@
#include "net/base/net_errors.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "net/third_party/quiche/src/quic/core/quic_error_codes.h"
namespace net {
diff --git a/net/base/network_interfaces_linux.cc b/net/base/network_interfaces_linux.cc
index 3fcbed02b..616e77a8 100644
--- a/net/base/network_interfaces_linux.cc
+++ b/net/base/network_interfaces_linux.cc
@@ -18,7 +18,6 @@
#include "base/files/file_path.h"
#include "base/files/scoped_file.h"
-#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/string_util.h"
diff --git a/net/base/parse_number.cc b/net/base/parse_number.cc
index 460947f..5c2af51 100644
--- a/net/base/parse_number.cc
+++ b/net/base/parse_number.cc
@@ -4,7 +4,6 @@
#include "net/base/parse_number.h"
-#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
diff --git a/net/base/platform_mime_util_fuchsia.cc b/net/base/platform_mime_util_fuchsia.cc
index 99ababc..3ed266f7 100644
--- a/net/base/platform_mime_util_fuchsia.cc
+++ b/net/base/platform_mime_util_fuchsia.cc
@@ -6,7 +6,6 @@
#include <string>
-#include "base/logging.h"
#include "build/build_config.h"
namespace net {
diff --git a/net/base/platform_mime_util_linux.cc b/net/base/platform_mime_util_linux.cc
index 82b7ddf..5fa12699 100644
--- a/net/base/platform_mime_util_linux.cc
+++ b/net/base/platform_mime_util_linux.cc
@@ -6,7 +6,6 @@
#include <string>
-#include "base/logging.h"
#include "build/build_config.h"
#if defined(OS_ANDROID)
diff --git a/net/base/port_util.cc b/net/base/port_util.cc
index 63a7c35..a10a4b4 100644
--- a/net/base/port_util.cc
+++ b/net/base/port_util.cc
@@ -8,7 +8,7 @@
#include <set>
#include "base/lazy_instance.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "url/url_constants.h"
diff --git a/net/base/prioritized_dispatcher.cc b/net/base/prioritized_dispatcher.cc
index 79baa33..24c327ce 100644
--- a/net/base/prioritized_dispatcher.cc
+++ b/net/base/prioritized_dispatcher.cc
@@ -4,7 +4,7 @@
#include "net/base/prioritized_dispatcher.h"
-#include "base/logging.h"
+#include "base/check_op.h"
namespace net {
diff --git a/net/base/prioritized_dispatcher_unittest.cc b/net/base/prioritized_dispatcher_unittest.cc
index af62f7c..b2a859d 100644
--- a/net/base/prioritized_dispatcher_unittest.cc
+++ b/net/base/prioritized_dispatcher_unittest.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <string>
+#include "base/check.h"
#include "base/compiler_specific.h"
-#include "base/logging.h"
#include "net/base/request_priority.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/base/proxy_server.cc b/net/base/proxy_server.cc
index 17692cd9..c0118d5 100644
--- a/net/base/proxy_server.cc
+++ b/net/base/proxy_server.cc
@@ -6,7 +6,8 @@
#include <algorithm>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/string_util.h"
#include "base/trace_event/memory_usage_estimator.h"
#include "net/base/url_util.h"
diff --git a/net/base/registry_controlled_domains/registry_controlled_domain.cc b/net/base/registry_controlled_domains/registry_controlled_domain.cc
index 496b804..b39132b 100644
--- a/net/base/registry_controlled_domains/registry_controlled_domain.cc
+++ b/net/base/registry_controlled_domains/registry_controlled_domain.cc
@@ -45,7 +45,8 @@
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "net/base/lookup_string_in_fixed_set.h"
diff --git a/net/base/request_priority.cc b/net/base/request_priority.cc
index 87a6749..4492758d 100644
--- a/net/base/request_priority.cc
+++ b/net/base/request_priority.cc
@@ -4,7 +4,7 @@
#include "net/base/request_priority.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace net {
diff --git a/net/base/test_completion_callback_unittest.cc b/net/base/test_completion_callback_unittest.cc
index 40df9d0a..320ab31 100644
--- a/net/base/test_completion_callback_unittest.cc
+++ b/net/base/test_completion_callback_unittest.cc
@@ -7,9 +7,10 @@
#include "net/base/test_completion_callback.h"
#include "base/bind.h"
+#include "base/check_op.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/threading/thread_task_runner_handle.h"
#include "net/base/completion_once_callback.h"
diff --git a/net/base/upload_bytes_element_reader.cc b/net/base/upload_bytes_element_reader.cc
index 45cc5d0..b2fee1a 100644
--- a/net/base/upload_bytes_element_reader.cc
+++ b/net/base/upload_bytes_element_reader.cc
@@ -4,7 +4,7 @@
#include "net/base/upload_bytes_element_reader.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
diff --git a/net/base/upload_data_stream.cc b/net/base/upload_data_stream.cc
index ed6c705..edcba234 100644
--- a/net/base/upload_data_stream.cc
+++ b/net/base/upload_data_stream.cc
@@ -4,7 +4,7 @@
#include "net/base/upload_data_stream.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/values.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
diff --git a/net/base/url_util.cc b/net/base/url_util.cc
index 4405ca3..b6c36ea 100644
--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
@@ -12,7 +12,7 @@
#include <ws2tcpip.h>
#endif
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/net/base/winsock_init.cc b/net/base/winsock_init.cc
index 1f488c9..55c56161 100644
--- a/net/base/winsock_init.cc
+++ b/net/base/winsock_init.cc
@@ -6,8 +6,8 @@
#include "net/base/winsock_init.h"
+#include "base/check.h"
#include "base/lazy_instance.h"
-#include "base/logging.h"
namespace {
diff --git a/net/base/winsock_util.cc b/net/base/winsock_util.cc
index 5522e27..38cc61c 100644
--- a/net/base/winsock_util.cc
+++ b/net/base/winsock_util.cc
@@ -4,7 +4,7 @@
#include "net/base/winsock_util.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "net/base/net_errors.h"
namespace net {
diff --git a/net/cert/cert_database_mac.cc b/net/cert/cert_database_mac.cc
index c5dedce..c9ad52b9 100644
--- a/net/cert/cert_database_mac.cc
+++ b/net/cert/cert_database_mac.cc
@@ -7,10 +7,11 @@
#include <Security/Security.h>
#include "base/bind.h"
+#include "base/check.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/mac/mac_logging.h"
#include "base/message_loop/message_loop_current.h"
+#include "base/notreached.h"
#include "base/process/process_handle.h"
#include "base/single_thread_task_runner.h"
#include "base/synchronization/lock.h"
diff --git a/net/cert/cert_status_flags.cc b/net/cert/cert_status_flags.cc
index dce91ddf..fbac0de 100644
--- a/net/cert/cert_status_flags.cc
+++ b/net/cert/cert_status_flags.cc
@@ -4,7 +4,8 @@
#include "net/cert/cert_status_flags.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "net/base/net_errors.h"
namespace net {
diff --git a/net/cert/cert_verifier.cc b/net/cert/cert_verifier.cc
index ec0ee94d..58d75cb 100644
--- a/net/cert/cert_verifier.cc
+++ b/net/cert/cert_verifier.cc
@@ -15,7 +15,7 @@
#include "third_party/boringssl/src/include/openssl/sha.h"
#if defined(OS_NACL)
-#include "base/logging.h"
+#include "base/notreached.h"
#else
#include "net/cert/caching_cert_verifier.h"
#include "net/cert/coalescing_cert_verifier.h"
diff --git a/net/cert/cert_verify_proc_android.cc b/net/cert/cert_verify_proc_android.cc
index e649d0ab..712ab2b 100644
--- a/net/cert/cert_verify_proc_android.cc
+++ b/net/cert/cert_verify_proc_android.cc
@@ -7,9 +7,10 @@
#include <string>
#include <vector>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/strings/string_piece.h"
#include "crypto/sha2.h"
#include "net/android/cert_verify_result_android.h"
diff --git a/net/cert/internal/cert_error_params.cc b/net/cert/internal/cert_error_params.cc
index f454572..d1d2bb6 100644
--- a/net/cert/internal/cert_error_params.cc
+++ b/net/cert/internal/cert_error_params.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/string_number_conversions.h"
#include "net/der/input.h"
diff --git a/net/cert/internal/cert_errors.cc b/net/cert/internal/cert_errors.cc
index fc44c0d..cea2115 100644
--- a/net/cert/internal/cert_errors.cc
+++ b/net/cert/internal/cert_errors.cc
@@ -4,7 +4,6 @@
#include "net/cert/internal/cert_errors.h"
-#include "base/logging.h"
#include "base/strings/strcat.h"
#include "base/strings/string_split.h"
#include "base/strings/stringprintf.h"
diff --git a/net/cert/internal/general_names.cc b/net/cert/internal/general_names.cc
index 7e13236..f8bd987 100644
--- a/net/cert/internal/general_names.cc
+++ b/net/cert/internal/general_names.cc
@@ -4,7 +4,7 @@
#include "net/cert/internal/general_names.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/string_util.h"
#include "net/cert/internal/cert_error_params.h"
#include "net/cert/internal/cert_errors.h"
diff --git a/net/cert/internal/name_constraints.cc b/net/cert/internal/name_constraints.cc
index 7e7864b..a6ed9c5 100644
--- a/net/cert/internal/name_constraints.cc
+++ b/net/cert/internal/name_constraints.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/numerics/clamped_math.h"
#include "base/strings/string_util.h"
#include "net/cert/internal/cert_errors.h"
diff --git a/net/cert/internal/ocsp_unittest.cc b/net/cert/internal/ocsp_unittest.cc
index 61426791..79fc0d4 100644
--- a/net/cert/internal/ocsp_unittest.cc
+++ b/net/cert/internal/ocsp_unittest.cc
@@ -5,7 +5,6 @@
#include "net/cert/internal/ocsp.h"
#include "base/base64.h"
-#include "base/logging.h"
#include "base/strings/string_util.h"
#include "net/cert/internal/test_helpers.h"
#include "net/der/encode_values.h"
diff --git a/net/cert/internal/parse_name.cc b/net/cert/internal/parse_name.cc
index 35627e13..1ecba7d 100644
--- a/net/cert/internal/parse_name.cc
+++ b/net/cert/internal/parse_name.cc
@@ -4,7 +4,8 @@
#include "net/cert/internal/parse_name.h"
-#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_conversion_utils.h"
diff --git a/net/cert/internal/simple_path_builder_delegate.cc b/net/cert/internal/simple_path_builder_delegate.cc
index 713baa6..e4259ee 100644
--- a/net/cert/internal/simple_path_builder_delegate.cc
+++ b/net/cert/internal/simple_path_builder_delegate.cc
@@ -4,7 +4,6 @@
#include "net/cert/internal/simple_path_builder_delegate.h"
-#include "base/logging.h"
#include "net/cert/internal/cert_error_params.h"
#include "net/cert/internal/cert_errors.h"
#include "net/cert/internal/signature_algorithm.h"
diff --git a/net/cert/internal/trust_store.cc b/net/cert/internal/trust_store.cc
index d1cff7c..20d3c8d3 100644
--- a/net/cert/internal/trust_store.cc
+++ b/net/cert/internal/trust_store.cc
@@ -4,7 +4,7 @@
#include "net/cert/internal/trust_store.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace net {
diff --git a/net/cert/internal/verify_certificate_chain.cc b/net/cert/internal/verify_certificate_chain.cc
index 8089e72..d9d34bdb 100644
--- a/net/cert/internal/verify_certificate_chain.cc
+++ b/net/cert/internal/verify_certificate_chain.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "base/logging.h"
+#include "base/check.h"
#include "net/cert/internal/cert_error_params.h"
#include "net/cert/internal/cert_errors.h"
#include "net/cert/internal/common_cert_errors.h"
diff --git a/net/cert/internal/verify_name_match.cc b/net/cert/internal/verify_name_match.cc
index 68194e7..c887e94 100644
--- a/net/cert/internal/verify_name_match.cc
+++ b/net/cert/internal/verify_name_match.cc
@@ -4,7 +4,8 @@
#include "net/cert/internal/verify_name_match.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "base/strings/string_util.h"
#include "net/cert/internal/cert_error_params.h"
#include "net/cert/internal/cert_errors.h"
diff --git a/net/cert/internal/verify_signed_data.cc b/net/cert/internal/verify_signed_data.cc
index 668e8cb..9c6e235 100644
--- a/net/cert/internal/verify_signed_data.cc
+++ b/net/cert/internal/verify_signed_data.cc
@@ -5,7 +5,6 @@
#include "net/cert/internal/verify_signed_data.h"
#include "base/compiler_specific.h"
-#include "base/logging.h"
#include "base/numerics/safe_math.h"
#include "crypto/openssl_util.h"
#include "net/cert/internal/cert_errors.h"
diff --git a/net/cert/jwk_serializer.cc b/net/cert/jwk_serializer.cc
index 870099e..768dab0 100644
--- a/net/cert/jwk_serializer.cc
+++ b/net/cert/jwk_serializer.cc
@@ -5,7 +5,6 @@
#include "net/cert/jwk_serializer.h"
#include "base/base64url.h"
-#include "base/logging.h"
#include "base/strings/string_util.h"
#include "base/values.h"
#include "crypto/openssl_util.h"
diff --git a/net/cert/merkle_audit_proof.cc b/net/cert/merkle_audit_proof.cc
index 95fd197..585ffbb 100644
--- a/net/cert/merkle_audit_proof.cc
+++ b/net/cert/merkle_audit_proof.cc
@@ -4,7 +4,7 @@
#include "net/cert/merkle_audit_proof.h"
-#include "base/logging.h"
+#include "base/check_op.h"
namespace net {
namespace ct {
diff --git a/net/cert/merkle_audit_proof_unittest.cc b/net/cert/merkle_audit_proof_unittest.cc
index 1c3d3f9..d4b9880 100644
--- a/net/cert/merkle_audit_proof_unittest.cc
+++ b/net/cert/merkle_audit_proof_unittest.cc
@@ -4,7 +4,7 @@
#include "net/cert/merkle_audit_proof.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/cert/test_root_certs_android.cc b/net/cert/test_root_certs_android.cc
index 6160fa3..c1812db 100644
--- a/net/cert/test_root_certs_android.cc
+++ b/net/cert/test_root_certs_android.cc
@@ -5,7 +5,6 @@
#include "net/cert/test_root_certs.h"
#include "base/location.h"
-#include "base/logging.h"
#include "net/android/network_library.h"
#include "net/cert/x509_certificate.h"
#include "third_party/boringssl/src/include/openssl/pool.h"
diff --git a/net/cert/test_root_certs_mac.cc b/net/cert/test_root_certs_mac.cc
index 6d0df0a..bdd5be3a 100644
--- a/net/cert/test_root_certs_mac.cc
+++ b/net/cert/test_root_certs_mac.cc
@@ -6,7 +6,6 @@
#include <Security/Security.h>
-#include "base/logging.h"
#include "net/cert/internal/cert_errors.h"
#include "net/cert/x509_certificate.h"
#include "net/cert/x509_util.h"
diff --git a/net/cert/test_root_certs_win.cc b/net/cert/test_root_certs_win.cc
index d581099a..1b6e8f5 100644
--- a/net/cert/test_root_certs_win.cc
+++ b/net/cert/test_root_certs_win.cc
@@ -6,8 +6,8 @@
#include <stdint.h>
+#include "base/check.h"
#include "base/lazy_instance.h"
-#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/win/win_util.h"
#include "net/cert/x509_certificate.h"
diff --git a/net/cert/x509_cert_types.cc b/net/cert/x509_cert_types.cc
index 783f409..c089629 100644
--- a/net/cert/x509_cert_types.cc
+++ b/net/cert/x509_cert_types.cc
@@ -7,7 +7,6 @@
#include <cstdlib>
#include <cstring>
-#include "base/logging.h"
#include "base/strings/string_piece.h"
#include "base/time/time.h"
#include "net/base/parse_number.h"
diff --git a/net/cert/x509_util_mac.cc b/net/cert/x509_util_mac.cc
index e36e161..e34a326 100644
--- a/net/cert/x509_util_mac.cc
+++ b/net/cert/x509_util_mac.cc
@@ -6,7 +6,7 @@
#include <CommonCrypto/CommonDigest.h>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/sys_string_conversions.h"
#include "net/cert/x509_certificate.h"
#include "third_party/apple_apsl/cssmapplePriv.h"
diff --git a/net/cert_net/cert_net_fetcher_url_request.cc b/net/cert_net/cert_net_fetcher_url_request.cc
index a136c2c..57ad2098 100644
--- a/net/cert_net/cert_net_fetcher_url_request.cc
+++ b/net/cert_net/cert_net_fetcher_url_request.cc
@@ -63,7 +63,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/numerics/safe_math.h"
diff --git a/net/cert_net/nss_ocsp_unittest.cc b/net/cert_net/nss_ocsp_unittest.cc
index 35317b5..f488056 100644
--- a/net/cert_net/nss_ocsp_unittest.cc
+++ b/net/cert_net/nss_ocsp_unittest.cc
@@ -10,7 +10,6 @@
#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 "net/base/net_errors.h"
diff --git a/net/cookies/cookie_change_dispatcher_test_helpers.cc b/net/cookies/cookie_change_dispatcher_test_helpers.cc
index 0db6daa..3419e66 100644
--- a/net/cookies/cookie_change_dispatcher_test_helpers.cc
+++ b/net/cookies/cookie_change_dispatcher_test_helpers.cc
@@ -4,7 +4,7 @@
#include "net/cookies/cookie_change_dispatcher_test_helpers.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace net {
diff --git a/net/cookies/cookie_constants.cc b/net/cookies/cookie_constants.cc
index 95adeef..bf8dd08 100644
--- a/net/cookies/cookie_constants.cc
+++ b/net/cookies/cookie_constants.cc
@@ -4,8 +4,8 @@
#include "net/cookies/cookie_constants.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/strings/string_util.h"
namespace net {
diff --git a/net/cookies/cookie_util.cc b/net/cookies/cookie_util.cc
index 977b9ccb..7f3afe4 100644
--- a/net/cookies/cookie_util.cc
+++ b/net/cookies/cookie_util.cc
@@ -9,8 +9,9 @@
#include "base/bind.h"
#include "base/callback.h"
+#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_piece.h"
#include "base/strings/string_tokenizer.h"
diff --git a/net/cookies/parse_cookie_line_fuzzer.cc b/net/cookies/parse_cookie_line_fuzzer.cc
index e65412f1..4ea774a 100644
--- a/net/cookies/parse_cookie_line_fuzzer.cc
+++ b/net/cookies/parse_cookie_line_fuzzer.cc
@@ -7,7 +7,7 @@
#include <fuzzer/FuzzedDataProvider.h>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/cookies/parsed_cookie.h"
const std::string GetArbitraryString(FuzzedDataProvider* data_provider) {
diff --git a/net/cookies/static_cookie_policy.cc b/net/cookies/static_cookie_policy.cc
index 25c6e411..96a4575 100644
--- a/net/cookies/static_cookie_policy.cc
+++ b/net/cookies/static_cookie_policy.cc
@@ -4,7 +4,7 @@
#include "net/cookies/static_cookie_policy.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "net/base/net_errors.h"
#include "net/cookies/site_for_cookies.h"
#include "url/gurl.h"
diff --git a/net/der/input.cc b/net/der/input.cc
index 76d10105..8356512 100644
--- a/net/der/input.cc
+++ b/net/der/input.cc
@@ -8,7 +8,7 @@
#include <algorithm>
-#include "base/logging.h"
+#include "base/check_op.h"
namespace net {
diff --git a/net/der/input_unittest.cc b/net/der/input_unittest.cc
index 9bd1f55..c406481 100644
--- a/net/der/input_unittest.cc
+++ b/net/der/input_unittest.cc
@@ -4,7 +4,6 @@
#include "net/der/input.h"
-#include "base/logging.h"
#include "base/stl_util.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/der/parse_values.cc b/net/der/parse_values.cc
index 5da54a4..28360799 100644
--- a/net/der/parse_values.cc
+++ b/net/der/parse_values.cc
@@ -6,7 +6,8 @@
#include <tuple>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
namespace net {
diff --git a/net/der/parser.cc b/net/der/parser.cc
index df7f1188..f12ed83 100644
--- a/net/der/parser.cc
+++ b/net/der/parser.cc
@@ -4,7 +4,7 @@
#include "net/der/parser.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "net/der/parse_values.h"
namespace net {
diff --git a/net/der/tag.cc b/net/der/tag.cc
index a2b0074..f4ef846 100644
--- a/net/der/tag.cc
+++ b/net/der/tag.cc
@@ -4,7 +4,7 @@
#include "net/der/tag.h"
-#include "base/logging.h"
+#include "base/check_op.h"
namespace net {
diff --git a/net/disk_cache/blockfile/addr.cc b/net/disk_cache/blockfile/addr.cc
index cbe42f7..bf44bd7 100644
--- a/net/disk_cache/blockfile/addr.cc
+++ b/net/disk_cache/blockfile/addr.cc
@@ -4,7 +4,7 @@
#include "net/disk_cache/blockfile/addr.h"
-#include "base/logging.h"
+#include "base/check.h"
namespace disk_cache {
diff --git a/net/disk_cache/blockfile/bitmap.cc b/net/disk_cache/blockfile/bitmap.cc
index 016eaed4..a78dedac 100644
--- a/net/disk_cache/blockfile/bitmap.cc
+++ b/net/disk_cache/blockfile/bitmap.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include "base/bits.h"
-#include "base/logging.h"
+#include "base/check_op.h"
namespace {
// Returns the index of the first bit set to |value| from |word|. This code
diff --git a/net/disk_cache/blockfile/eviction.cc b/net/disk_cache/blockfile/eviction.cc
index 1ff15ab5..58975d0 100644
--- a/net/disk_cache/blockfile/eviction.cc
+++ b/net/disk_cache/blockfile/eviction.cc
@@ -33,10 +33,11 @@
#include <limits>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/compiler_specific.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/string_util.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/net/disk_cache/blockfile/file_ios.cc b/net/disk_cache/blockfile/file_ios.cc
index 984a34b1..89091fa 100644
--- a/net/disk_cache/blockfile/file_ios.cc
+++ b/net/disk_cache/blockfile/file_ios.cc
@@ -11,8 +11,8 @@
#include <utility>
#include "base/bind.h"
+#include "base/check.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/task/post_task.h"
#include "base/task/thread_pool.h"
diff --git a/net/disk_cache/blockfile/file_posix.cc b/net/disk_cache/blockfile/file_posix.cc
index b592110..210d717 100644
--- a/net/disk_cache/blockfile/file_posix.cc
+++ b/net/disk_cache/blockfile/file_posix.cc
@@ -9,8 +9,8 @@
#include <utility>
#include "base/bind.h"
+#include "base/check.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/run_loop.h"
#include "base/task/post_task.h"
#include "base/task/thread_pool.h"
diff --git a/net/disk_cache/blockfile/in_flight_backend_io.cc b/net/disk_cache/blockfile/in_flight_backend_io.cc
index 3d2250a..aa2bae8 100644
--- a/net/disk_cache/blockfile/in_flight_backend_io.cc
+++ b/net/disk_cache/blockfile/in_flight_backend_io.cc
@@ -8,9 +8,10 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "net/base/net_errors.h"
#include "net/disk_cache/blockfile/backend_impl.h"
diff --git a/net/disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc b/net/disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc
index 3936358..633aaa0 100644
--- a/net/disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc
+++ b/net/disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc
@@ -6,8 +6,8 @@
#include <stdlib.h>
+#include "base/check.h"
#include "base/files/file_path.h"
-#include "base/logging.h"
namespace disk_cache {
diff --git a/net/disk_cache/blockfile/mapped_file_win.cc b/net/disk_cache/blockfile/mapped_file_win.cc
index 1490212..5829dcc4 100644
--- a/net/disk_cache/blockfile/mapped_file_win.cc
+++ b/net/disk_cache/blockfile/mapped_file_win.cc
@@ -6,8 +6,8 @@
#include <memory>
+#include "base/check.h"
#include "base/files/file_path.h"
-#include "base/logging.h"
#include "net/disk_cache/disk_cache.h"
#include <windows.h>
diff --git a/net/disk_cache/blockfile/stats.cc b/net/disk_cache/blockfile/stats.cc
index 43c6758..224e1c9 100644
--- a/net/disk_cache/blockfile/stats.cc
+++ b/net/disk_cache/blockfile/stats.cc
@@ -4,13 +4,14 @@
#include "net/disk_cache/blockfile/stats.h"
+#include "base/check.h"
#include "base/format_macros.h"
-#include "base/logging.h"
#include "base/metrics/bucket_ranges.h"
#include "base/metrics/histogram.h"
#include "base/metrics/histogram_samples.h"
#include "base/metrics/sample_vector.h"
#include "base/metrics/statistics_recorder.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
diff --git a/net/disk_cache/disk_cache_test_util.cc b/net/disk_cache/disk_cache_test_util.cc
index 651533b1..959fa88b 100644
--- a/net/disk_cache/disk_cache_test_util.cc
+++ b/net/disk_cache/disk_cache_test_util.cc
@@ -4,9 +4,9 @@
#include "net/disk_cache/disk_cache_test_util.h"
+#include "base/check_op.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
-#include "base/logging.h"
#include "base/run_loop.h"
#include "base/threading/thread_task_runner_handle.h"
#include "net/base/net_errors.h"
diff --git a/net/disk_cache/memory/mem_entry_impl.cc b/net/disk_cache/memory/mem_entry_impl.cc
index 93680d2..b46a807 100644
--- a/net/disk_cache/memory/mem_entry_impl.cc
+++ b/net/disk_cache/memory/mem_entry_impl.cc
@@ -8,8 +8,8 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/format_macros.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/safe_math.h"
#include "base/strings/stringprintf.h"
diff --git a/net/disk_cache/net_log_parameters.cc b/net/disk_cache/net_log_parameters.cc
index 96e99bb0..67afd8b 100644
--- a/net/disk_cache/net_log_parameters.cc
+++ b/net/disk_cache/net_log_parameters.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/values.h"
#include "net/base/net_errors.h"
#include "net/disk_cache/disk_cache.h"
diff --git a/net/disk_cache/simple/post_doom_waiter.cc b/net/disk_cache/simple/post_doom_waiter.cc
index fbd63f5..0f355c3 100644
--- a/net/disk_cache/simple/post_doom_waiter.cc
+++ b/net/disk_cache/simple/post_doom_waiter.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/disk_cache/simple/simple_histogram_macros.h"
namespace disk_cache {
diff --git a/net/disk_cache/simple/simple_entry_impl.cc b/net/disk_cache/simple/simple_entry_impl.cc
index e59b6073..e9016dd 100644
--- a/net/disk_cache/simple/simple_entry_impl.cc
+++ b/net/disk_cache/simple/simple_entry_impl.cc
@@ -13,8 +13,9 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/task_runner.h"
#include "base/task_runner_util.h"
diff --git a/net/disk_cache/simple/simple_entry_operation.cc b/net/disk_cache/simple/simple_entry_operation.cc
index 70a6556..ebe9cad 100644
--- a/net/disk_cache/simple/simple_entry_operation.cc
+++ b/net/disk_cache/simple/simple_entry_operation.cc
@@ -6,7 +6,6 @@
#include <limits.h>
-#include "base/logging.h"
#include "net/base/io_buffer.h"
#include "net/disk_cache/disk_cache.h"
#include "net/disk_cache/simple/simple_entry_impl.h"
diff --git a/net/disk_cache/simple/simple_file_tracker_unittest.cc b/net/disk_cache/simple/simple_file_tracker_unittest.cc
index d46362f..0c34224a 100644
--- a/net/disk_cache/simple/simple_file_tracker_unittest.cc
+++ b/net/disk_cache/simple/simple_file_tracker_unittest.cc
@@ -8,7 +8,6 @@
#include "base/files/file.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/net/disk_cache/simple/simple_index.cc b/net/disk_cache/simple/simple_index.cc
index db57614f..0775f57 100644
--- a/net/disk_cache/simple/simple_index.cc
+++ b/net/disk_cache/simple/simple_index.cc
@@ -11,8 +11,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check_op.h"
#include "base/files/file_util.h"
-#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/pickle.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/disk_cache/simple/simple_index_file_unittest.cc b/net/disk_cache/simple/simple_index_file_unittest.cc
index 0b59cb0..c193f72 100644
--- a/net/disk_cache/simple/simple_index_file_unittest.cc
+++ b/net/disk_cache/simple/simple_index_file_unittest.cc
@@ -6,12 +6,12 @@
#include <memory>
+#include "base/check.h"
#include "base/files/file.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/hash/hash.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/pickle.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
diff --git a/net/disk_cache/simple/simple_index_unittest.cc b/net/disk_cache/simple/simple_index_unittest.cc
index 7d303f3..e6e8e932 100644
--- a/net/disk_cache/simple/simple_index_unittest.cc
+++ b/net/disk_cache/simple/simple_index_unittest.cc
@@ -12,7 +12,6 @@
#include "base/bind.h"
#include "base/files/scoped_temp_dir.h"
#include "base/hash/hash.h"
-#include "base/logging.h"
#include "base/pickle.h"
#include "base/strings/stringprintf.h"
#include "base/task_runner.h"
diff --git a/net/disk_cache/simple/simple_net_log_parameters.cc b/net/disk_cache/simple/simple_net_log_parameters.cc
index ce4889b..ee3241b 100644
--- a/net/disk_cache/simple/simple_net_log_parameters.cc
+++ b/net/disk_cache/simple/simple_net_log_parameters.cc
@@ -7,9 +7,9 @@
#include <utility>
#include "base/bind.h"
+#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/format_macros.h"
-#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "net/base/net_errors.h"
diff --git a/net/disk_cache/simple/simple_util.cc b/net/disk_cache/simple/simple_util.cc
index 41fc7e5..59d3b91 100644
--- a/net/disk_cache/simple/simple_util.cc
+++ b/net/disk_cache/simple/simple_util.cc
@@ -6,10 +6,10 @@
#include <limits>
+#include "base/check_op.h"
#include "base/files/file_util.h"
#include "base/format_macros.h"
#include "base/hash/sha1.h"
-#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
diff --git a/net/disk_cache/simple/simple_util_unittest.cc b/net/disk_cache/simple/simple_util_unittest.cc
index 442dc42..675f310 100644
--- a/net/disk_cache/simple/simple_util_unittest.cc
+++ b/net/disk_cache/simple/simple_util_unittest.cc
@@ -5,7 +5,6 @@
#include <stdint.h>
#include <string>
-#include "base/logging.h"
#include "net/disk_cache/simple/simple_util.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/dns/address_info_test_util.cc b/net/dns/address_info_test_util.cc
index 960af4b..708dd8e 100644
--- a/net/dns/address_info_test_util.cc
+++ b/net/dns/address_info_test_util.cc
@@ -6,7 +6,7 @@
#include <cstring>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/sys_byteorder.h"
#include "net/base/sys_addrinfo.h"
diff --git a/net/dns/address_sorter_posix_unittest.cc b/net/dns/address_sorter_posix_unittest.cc
index 3a411b2..92a15b6 100644
--- a/net/dns/address_sorter_posix_unittest.cc
+++ b/net/dns/address_sorter_posix_unittest.cc
@@ -8,8 +8,9 @@
#include <string>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
+#include "base/notreached.h"
#include "net/base/ip_address.h"
#include "net/base/net_errors.h"
#include "net/base/test_completion_callback.h"
diff --git a/net/dns/address_sorter_unittest.cc b/net/dns/address_sorter_unittest.cc
index 89d2afb..49ca0c2 100644
--- a/net/dns/address_sorter_unittest.cc
+++ b/net/dns/address_sorter_unittest.cc
@@ -11,7 +11,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/test/task_environment.h"
#include "net/base/address_list.h"
#include "net/base/completion_once_callback.h"
diff --git a/net/dns/context_host_resolver.cc b/net/dns/context_host_resolver.cc
index 96876d2..0ae8cc8 100644
--- a/net/dns/context_host_resolver.cc
+++ b/net/dns/context_host_resolver.cc
@@ -7,7 +7,7 @@
#include <string>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/no_destructor.h"
#include "base/strings/string_piece.h"
#include "base/time/tick_clock.h"
diff --git a/net/dns/dns_config_service.cc b/net/dns/dns_config_service.cc
index ff2cf8d..a0f1fccb 100644
--- a/net/dns/dns_config_service.cc
+++ b/net/dns/dns_config_service.cc
@@ -6,8 +6,9 @@
#include <string>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
namespace net {
diff --git a/net/dns/dns_config_service_win_unittest.cc b/net/dns/dns_config_service_win_unittest.cc
index 8b1bc05d..cd34aa1 100644
--- a/net/dns/dns_config_service_win_unittest.cc
+++ b/net/dns/dns_config_service_win_unittest.cc
@@ -4,7 +4,7 @@
#include "net/dns/dns_config_service_win.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/free_deleter.h"
#include "net/base/ip_address.h"
#include "net/base/ip_endpoint.h"
diff --git a/net/dns/dns_hosts.cc b/net/dns/dns_hosts.cc
index 6bc6557..13ee84b7 100644
--- a/net/dns/dns_hosts.cc
+++ b/net/dns/dns_hosts.cc
@@ -4,8 +4,8 @@
#include "net/dns/dns_hosts.h"
+#include "base/check.h"
#include "base/files/file_util.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_util.h"
diff --git a/net/dns/dns_reloader.cc b/net/dns/dns_reloader.cc
index 1c014a65..0c0d0d8 100644
--- a/net/dns/dns_reloader.cc
+++ b/net/dns/dns_reloader.cc
@@ -10,9 +10,9 @@
#include <resolv.h>
#include "base/lazy_instance.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/message_loop/message_loop_current.h"
+#include "base/notreached.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_local.h"
#include "net/base/network_change_notifier.h"
diff --git a/net/dns/fuzzed_host_resolver_util.cc b/net/dns/fuzzed_host_resolver_util.cc
index 70193304..0110c3d 100644
--- a/net/dns/fuzzed_host_resolver_util.cc
+++ b/net/dns/fuzzed_host_resolver_util.cc
@@ -16,10 +16,11 @@
#include <vector>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
+#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "net/base/address_list.h"
diff --git a/net/dns/host_resolver.cc b/net/dns/host_resolver.cc
index 4af28061..4d7dee3 100644
--- a/net/dns/host_resolver.cc
+++ b/net/dns/host_resolver.cc
@@ -7,9 +7,10 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/macros.h"
#include "base/no_destructor.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "net/base/address_list.h"
diff --git a/net/dns/host_resolver_manager_fuzzer.cc b/net/dns/host_resolver_manager_fuzzer.cc
index 2a2828c..15dfa5a 100644
--- a/net/dns/host_resolver_manager_fuzzer.cc
+++ b/net/dns/host_resolver_manager_fuzzer.cc
@@ -11,7 +11,7 @@
#include <vector>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "net/base/address_family.h"
diff --git a/net/dns/host_resolver_mdns_listener_impl.cc b/net/dns/host_resolver_mdns_listener_impl.cc
index 6f18f77..88102df 100644
--- a/net/dns/host_resolver_mdns_listener_impl.cc
+++ b/net/dns/host_resolver_mdns_listener_impl.cc
@@ -4,7 +4,8 @@
#include "net/dns/host_resolver_mdns_listener_impl.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "net/base/host_port_pair.h"
#include "net/dns/host_cache.h"
#include "net/dns/host_resolver_mdns_task.h"
diff --git a/net/dns/host_resolver_mdns_task.cc b/net/dns/host_resolver_mdns_task.cc
index d56dc587..551ab7a 100644
--- a/net/dns/host_resolver_mdns_task.cc
+++ b/net/dns/host_resolver_mdns_task.cc
@@ -8,7 +8,8 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/string_util.h"
#include "net/base/ip_endpoint.h"
#include "net/base/net_errors.h"
diff --git a/net/dns/host_resolver_proc.cc b/net/dns/host_resolver_proc.cc
index 7fe8e1d0..9b8f30e 100644
--- a/net/dns/host_resolver_proc.cc
+++ b/net/dns/host_resolver_proc.cc
@@ -8,7 +8,7 @@
#include "build/build_config.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/threading/scoped_blocking_call.h"
#include "net/base/address_list.h"
#include "net/base/net_errors.h"
diff --git a/net/dns/integrity_record_fuzzer.cc b/net/dns/integrity_record_fuzzer.cc
index ad1d984..e3091b0 100644
--- a/net/dns/integrity_record_fuzzer.cc
+++ b/net/dns/integrity_record_fuzzer.cc
@@ -7,7 +7,7 @@
#include <string>
#include <vector>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/optional.h"
#include "base/strings/string_piece.h"
#include "net/dns/record_rdata.h"
diff --git a/net/dns/notify_watcher_mac.cc b/net/dns/notify_watcher_mac.cc
index b7ab2a9..e69c9b2f 100644
--- a/net/dns/notify_watcher_mac.cc
+++ b/net/dns/notify_watcher_mac.cc
@@ -7,7 +7,7 @@
#include <notify.h>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/mac/mac_util.h"
#include "base/posix/eintr_wrapper.h"
diff --git a/net/dns/public/doh_provider_list.cc b/net/dns/public/doh_provider_list.cc
index 7a67bdb..d68eb69 100644
--- a/net/dns/public/doh_provider_list.cc
+++ b/net/dns/public/doh_provider_list.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/no_destructor.h"
#include "net/dns/public/util.h"
diff --git a/net/dns/public/util.cc b/net/dns/public/util.cc
index f740222..5aab840a2b 100644
--- a/net/dns/public/util.cc
+++ b/net/dns/public/util.cc
@@ -7,7 +7,8 @@
#include <set>
#include <unordered_map>
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "build/build_config.h"
#include "net/base/ip_address.h"
#include "net/dns/public/dns_protocol.h"
diff --git a/net/dns/resolve_context.cc b/net/dns/resolve_context.cc
index 9504b9e..7223cdd 100644
--- a/net/dns/resolve_context.cc
+++ b/net/dns/resolve_context.cc
@@ -10,7 +10,7 @@
#include <string>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/bucket_ranges.h"
#include "base/metrics/histogram.h"
#include "base/metrics/histogram_base.h"
diff --git a/net/dns/serial_worker.cc b/net/dns/serial_worker.cc
index 4a77f66..01f1711 100644
--- a/net/dns/serial_worker.cc
+++ b/net/dns/serial_worker.cc
@@ -5,8 +5,9 @@
#include "net/dns/serial_worker.h"
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/task/post_task.h"
#include "base/task/thread_pool.h"
#include "base/threading/sequenced_task_runner_handle.h"
diff --git a/net/dns/system_dns_config_change_notifier.cc b/net/dns/system_dns_config_change_notifier.cc
index 4575c9b..95232497 100644
--- a/net/dns/system_dns_config_change_notifier.cc
+++ b/net/dns/system_dns_config_change_notifier.cc
@@ -8,8 +8,8 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
#include "base/sequenced_task_runner.h"
diff --git a/net/extras/preload_data/decoder.cc b/net/extras/preload_data/decoder.cc
index 75b48249..f20e955 100644
--- a/net/extras/preload_data/decoder.cc
+++ b/net/extras/preload_data/decoder.cc
@@ -3,7 +3,8 @@
// found in the LICENSE file.
#include "net/extras/preload_data/decoder.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
namespace net {
diff --git a/net/filter/brotli_source_stream.cc b/net/filter/brotli_source_stream.cc
index 887a0f0..662eb26 100644
--- a/net/filter/brotli_source_stream.cc
+++ b/net/filter/brotli_source_stream.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/bit_cast.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
#include "base/metrics/histogram_macros.h"
#include "net/base/io_buffer.h"
diff --git a/net/filter/brotli_source_stream_fuzzer.cc b/net/filter/brotli_source_stream_fuzzer.cc
index 8c8ba18..e721ee1e 100644
--- a/net/filter/brotli_source_stream_fuzzer.cc
+++ b/net/filter/brotli_source_stream_fuzzer.cc
@@ -6,7 +6,6 @@
#include <fuzzer/FuzzedDataProvider.h>
-#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "net/base/io_buffer.h"
#include "net/base/test_completion_callback.h"
diff --git a/net/filter/filter_source_stream.cc b/net/filter/filter_source_stream.cc
index dae553e..6ed1b1d 100644
--- a/net/filter/filter_source_stream.cc
+++ b/net/filter/filter_source_stream.cc
@@ -7,8 +7,9 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_util.h"
#include "net/base/io_buffer.h"
diff --git a/net/filter/filter_source_stream_test_util.cc b/net/filter/filter_source_stream_test_util.cc
index 95c9fbd..ec3b27f 100644
--- a/net/filter/filter_source_stream_test_util.cc
+++ b/net/filter/filter_source_stream_test_util.cc
@@ -5,7 +5,7 @@
#include "net/filter/filter_source_stream_test_util.h"
#include "base/bit_cast.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "third_party/zlib/zlib.h"
namespace net {
diff --git a/net/filter/gzip_header.cc b/net/filter/gzip_header.cc
index 6b0d1da..0dd2274 100644
--- a/net/filter/gzip_header.cc
+++ b/net/filter/gzip_header.cc
@@ -8,7 +8,7 @@
#include <algorithm>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "third_party/zlib/zlib.h"
namespace net {
diff --git a/net/filter/gzip_source_stream.cc b/net/filter/gzip_source_stream.cc
index 629d7b7..13d55f3 100644
--- a/net/filter/gzip_source_stream.cc
+++ b/net/filter/gzip_source_stream.cc
@@ -9,8 +9,9 @@
#include "base/bind.h"
#include "base/bit_cast.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ref_counted.h"
+#include "base/notreached.h"
#include "net/base/io_buffer.h"
#include "third_party/zlib/zlib.h"
diff --git a/net/filter/mock_source_stream.cc b/net/filter/mock_source_stream.cc
index 2e89836..55fbaa4 100644
--- a/net/filter/mock_source_stream.cc
+++ b/net/filter/mock_source_stream.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/base/io_buffer.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/ftp/ftp_auth_cache.cc b/net/ftp/ftp_auth_cache.cc
index 63da9ae..960bde6 100644
--- a/net/ftp/ftp_auth_cache.cc
+++ b/net/ftp/ftp_auth_cache.cc
@@ -4,7 +4,7 @@
#include "net/ftp/ftp_auth_cache.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "url/gurl.h"
namespace net {
diff --git a/net/ftp/ftp_ctrl_response_buffer.cc b/net/ftp/ftp_ctrl_response_buffer.cc
index ae31f46f..2fce738 100644
--- a/net/ftp/ftp_ctrl_response_buffer.cc
+++ b/net/ftp/ftp_ctrl_response_buffer.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/string_piece.h"
#include "base/values.h"
#include "net/base/net_errors.h"
diff --git a/net/ftp/ftp_network_layer.cc b/net/ftp/ftp_network_layer.cc
index 9cb3b286..3fb56ae 100644
--- a/net/ftp/ftp_network_layer.cc
+++ b/net/ftp/ftp_network_layer.cc
@@ -4,7 +4,7 @@
#include "net/ftp/ftp_network_layer.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "net/ftp/ftp_network_session.h"
#include "net/ftp/ftp_network_transaction.h"
#include "net/socket/client_socket_factory.h"
diff --git a/net/ftp/ftp_util.cc b/net/ftp/ftp_util.cc
index 4af3603..b70981c6 100644
--- a/net/ftp/ftp_util.cc
+++ b/net/ftp/ftp_util.cc
@@ -7,10 +7,10 @@
#include <map>
#include <vector>
+#include "base/check_op.h"
#include "base/i18n/case_conversion.h"
#include "base/i18n/char_iterator.h"
#include "base/i18n/unicodestring.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/singleton.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/http/alternative_service.cc b/net/http/alternative_service.cc
index f4c5a0c..56273b99 100644
--- a/net/http/alternative_service.cc
+++ b/net/http/alternative_service.cc
@@ -4,9 +4,10 @@
#include "net/http/alternative_service.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/histogram_macros_local.h"
+#include "base/notreached.h"
#include "base/strings/stringprintf.h"
namespace net {
diff --git a/net/http/failing_http_transaction_factory.cc b/net/http/failing_http_transaction_factory.cc
index dc48ed8..7f367a8 100644
--- a/net/http/failing_http_transaction_factory.cc
+++ b/net/http/failing_http_transaction_factory.cc
@@ -9,9 +9,10 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "net/base/completion_once_callback.h"
diff --git a/net/http/http_auth_gssapi_posix_unittest.cc b/net/http/http_auth_gssapi_posix_unittest.cc
index b921148..ac76434a 100644
--- a/net/http/http_auth_gssapi_posix_unittest.cc
+++ b/net/http/http_auth_gssapi_posix_unittest.cc
@@ -8,8 +8,8 @@
#include "base/base_paths.h"
#include "base/bind.h"
+#include "base/check.h"
#include "base/json/json_reader.h"
-#include "base/logging.h"
#include "base/native_library.h"
#include "base/path_service.h"
#include "base/stl_util.h"
diff --git a/net/http/http_auth_handler.cc b/net/http/http_auth_handler.cc
index fc89e54..b62f870 100644
--- a/net/http/http_auth_handler.cc
+++ b/net/http/http_auth_handler.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/base/net_errors.h"
#include "net/http/http_auth_challenge_tokenizer.h"
#include "net/log/net_log.h"
diff --git a/net/http/http_basic_state.cc b/net/http/http_basic_state.cc
index a0c19a5..937b070 100644
--- a/net/http/http_basic_state.cc
+++ b/net/http/http_basic_state.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/stl_util.h"
#include "net/base/io_buffer.h"
#include "net/http/http_request_info.h"
diff --git a/net/http/http_byte_range.cc b/net/http/http_byte_range.cc
index ad12fa9..30a5d72 100644
--- a/net/http/http_byte_range.cc
+++ b/net/http/http_byte_range.cc
@@ -4,8 +4,8 @@
#include <algorithm>
+#include "base/check.h"
#include "base/format_macros.h"
-#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "net/http/http_byte_range.h"
diff --git a/net/http/http_content_disposition.cc b/net/http/http_content_disposition.cc
index df3f590..4fbc43da 100644
--- a/net/http/http_content_disposition.cc
+++ b/net/http/http_content_disposition.cc
@@ -5,7 +5,7 @@
#include "net/http/http_content_disposition.h"
#include "base/base64.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/string_util.h"
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index c7d36e62..6c0030d 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -4,7 +4,7 @@
#include "net/http/http_network_layer.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/power_monitor/power_monitor.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index f6cf262..af7af4b 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -9,8 +9,9 @@
#include <utility>
#include "base/atomic_sequence_num.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
diff --git a/net/http/http_proxy_client_socket_fuzzer.cc b/net/http/http_proxy_client_socket_fuzzer.cc
index a173b38..1bb19eae 100644
--- a/net/http/http_proxy_client_socket_fuzzer.cc
+++ b/net/http/http_proxy_client_socket_fuzzer.cc
@@ -12,7 +12,7 @@
#include <memory>
#include <string>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/utf_string_conversions.h"
#include "net/base/address_list.h"
#include "net/base/auth.h"
diff --git a/net/http/http_response_body_drainer.cc b/net/http/http_response_body_drainer.cc
index bd60c42..ee4f870 100644
--- a/net/http/http_response_body_drainer.cc
+++ b/net/http/http_response_body_drainer.cc
@@ -5,9 +5,10 @@
#include "net/http/http_response_body_drainer.h"
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
+#include "base/notreached.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/http/http_network_session.h"
diff --git a/net/http/http_security_headers.cc b/net/http/http_security_headers.cc
index d62c335..08233567 100644
--- a/net/http/http_security_headers.cc
+++ b/net/http/http_security_headers.cc
@@ -5,7 +5,8 @@
#include <limits>
#include "base/base64.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/string_util.h"
diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc
index c777169..da1bf83 100644
--- a/net/http/http_server_properties.cc
+++ b/net/http/http_server_properties.cc
@@ -5,9 +5,9 @@
#include "net/http/http_server_properties.h"
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/feature_list.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
diff --git a/net/http/http_server_properties_unittest.cc b/net/http/http_server_properties_unittest.cc
index adf30a1..f6d9c55 100644
--- a/net/http/http_server_properties_unittest.cc
+++ b/net/http/http_server_properties_unittest.cc
@@ -9,9 +9,9 @@
#include <vector>
#include "base/bind.h"
+#include "base/check.h"
#include "base/feature_list.h"
#include "base/json/json_writer.h"
-#include "base/logging.h"
#include "base/run_loop.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/simple_test_clock.h"
diff --git a/net/http/http_status_code.cc b/net/http/http_status_code.cc
index fb7261b3..84d8c23 100644
--- a/net/http/http_status_code.cc
+++ b/net/http/http_status_code.cc
@@ -4,7 +4,9 @@
#include "net/http/http_status_code.h"
-#include "base/logging.h"
+#include <ostream>
+
+#include "base/notreached.h"
namespace net {
diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc
index eabab2c..8a92dd2c 100644
--- a/net/http/http_stream_factory.cc
+++ b/net/http/http_stream_factory.cc
@@ -7,8 +7,9 @@
#include <tuple>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/metrics/histogram_macros.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/net/http/http_stream_factory_job.cc b/net/http/http_stream_factory_job.cc
index 1bc1d174..b2a42a4b 100644
--- a/net/http/http_stream_factory_job.cc
+++ b/net/http/http_stream_factory_job.cc
@@ -9,11 +9,12 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check_op.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/notreached.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/http/http_stream_parser_fuzzer.cc b/net/http/http_stream_parser_fuzzer.cc
index 03c2727..e5bd0a3b 100644
--- a/net/http/http_stream_parser_fuzzer.cc
+++ b/net/http/http_stream_parser_fuzzer.cc
@@ -14,7 +14,7 @@
#include <string>
#include <vector>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "net/base/io_buffer.h"
diff --git a/net/http/http_stream_request.cc b/net/http/http_stream_request.cc
index 82cca06..3a38169 100644
--- a/net/http/http_stream_request.cc
+++ b/net/http/http_stream_request.cc
@@ -7,7 +7,7 @@
#include <utility>
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/stl_util.h"
#include "net/http/bidirectional_stream_impl.h"
#include "net/log/net_log_event_type.h"
diff --git a/net/http/http_util.cc b/net/http/http_util.cc
index c92b50b55..0ed79f0 100644
--- a/net/http/http_util.cc
+++ b/net/http/http_util.cc
@@ -9,7 +9,7 @@
#include <algorithm>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/stl_util.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/http/mock_gssapi_library_posix.cc b/net/http/mock_gssapi_library_posix.cc
index e492bd99..5daabe7 100644
--- a/net/http/mock_gssapi_library_posix.cc
+++ b/net/http/mock_gssapi_library_posix.cc
@@ -4,7 +4,6 @@
#include "net/http/mock_gssapi_library_posix.h"
-#include "base/logging.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/http/mock_sspi_library_win.cc b/net/http/mock_sspi_library_win.cc
index 543a1c2..57d519b 100644
--- a/net/http/mock_sspi_library_win.cc
+++ b/net/http/mock_sspi_library_win.cc
@@ -8,7 +8,7 @@
#include <cstring>
#include <memory>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/string16.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/net/log/net_log.cc b/net/log/net_log.cc
index bc5a639..6d10b07 100644
--- a/net/log/net_log.cc
+++ b/net/log/net_log.cc
@@ -4,8 +4,9 @@
#include "net/log/net_log.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/no_destructor.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "net/log/net_log_values.h"
diff --git a/net/log/net_log_source.cc b/net/log/net_log_source.cc
index ff1e84d4..8386d63f3 100644
--- a/net/log/net_log_source.cc
+++ b/net/log/net_log_source.cc
@@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/values.h"
#include "net/log/net_log_capture_mode.h"
diff --git a/net/log/net_log_util.cc b/net/log/net_log_util.cc
index 3661f90..b00221e 100644
--- a/net/log/net_log_util.cc
+++ b/net/log/net_log_util.cc
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/field_trial.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
diff --git a/net/log/net_log_with_source.cc b/net/log/net_log_with_source.cc
index 9e9575c8..5a6cbe1 100644
--- a/net/log/net_log_with_source.cc
+++ b/net/log/net_log_with_source.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/no_destructor.h"
#include "base/values.h"
#include "net/base/net_errors.h"
diff --git a/net/log/trace_net_log_observer.cc b/net/log/trace_net_log_observer.cc
index 70b65025..543d861 100644
--- a/net/log/trace_net_log_observer.cc
+++ b/net/log/trace_net_log_observer.cc
@@ -10,8 +10,8 @@
#include <string>
#include <utility>
+#include "base/check.h"
#include "base/json/json_writer.h"
-#include "base/logging.h"
#include "base/trace_event/trace_event.h"
#include "base/values.h"
#include "net/log/net_log_entry.h"
diff --git a/net/log/trace_net_log_observer_unittest.cc b/net/log/trace_net_log_observer_unittest.cc
index d705301..f2d135c 100644
--- a/net/log/trace_net_log_observer_unittest.cc
+++ b/net/log/trace_net_log_observer_unittest.cc
@@ -9,8 +9,8 @@
#include <vector>
#include "base/bind.h"
+#include "base/check.h"
#include "base/json/json_reader.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/ref_counted_memory.h"
diff --git a/net/nqe/effective_connection_type.cc b/net/nqe/effective_connection_type.cc
index bcc084e..e9d9aa7 100644
--- a/net/nqe/effective_connection_type.cc
+++ b/net/nqe/effective_connection_type.cc
@@ -4,7 +4,7 @@
#include "net/nqe/effective_connection_type.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace {
diff --git a/net/nqe/network_quality_estimator.cc b/net/nqe/network_quality_estimator.cc
index 4efd8316..00dfa2e 100644
--- a/net/nqe/network_quality_estimator.cc
+++ b/net/nqe/network_quality_estimator.cc
@@ -11,13 +11,14 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram.h"
#include "base/metrics/histogram_base.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/histogram_macros_local.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/net/nqe/network_quality_estimator_unittest.cc b/net/nqe/network_quality_estimator_unittest.cc
index f4a7ac764..af879ea 100644
--- a/net/nqe/network_quality_estimator_unittest.cc
+++ b/net/nqe/network_quality_estimator_unittest.cc
@@ -14,7 +14,7 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
#include "base/metrics/histogram_samples.h"
#include "base/optional.h"
diff --git a/net/nqe/network_quality_estimator_util.cc b/net/nqe/network_quality_estimator_util.cc
index 5ffdda2a..245e01d 100644
--- a/net/nqe/network_quality_estimator_util.cc
+++ b/net/nqe/network_quality_estimator_util.cc
@@ -7,7 +7,8 @@
#include <memory>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "net/base/host_port_pair.h"
#include "net/base/ip_address.h"
#include "net/base/ip_endpoint.h"
diff --git a/net/nqe/network_quality_observation.cc b/net/nqe/network_quality_observation.cc
index d3926c0..8f5bf33 100644
--- a/net/nqe/network_quality_observation.cc
+++ b/net/nqe/network_quality_observation.cc
@@ -4,8 +4,9 @@
#include "net/nqe/network_quality_observation.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/macros.h"
+#include "base/notreached.h"
namespace net {
diff --git a/net/nqe/observation_buffer_unittest.cc b/net/nqe/observation_buffer_unittest.cc
index 4ccd9b5..4d67f95 100644
--- a/net/nqe/observation_buffer_unittest.cc
+++ b/net/nqe/observation_buffer_unittest.cc
@@ -11,7 +11,6 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
#include "base/macros.h"
#include "base/test/simple_test_tick_clock.h"
#include "base/time/time.h"
diff --git a/net/nqe/throughput_analyzer_unittest.cc b/net/nqe/throughput_analyzer_unittest.cc
index 6443680..44fdd24e 100644
--- a/net/nqe/throughput_analyzer_unittest.cc
+++ b/net/nqe/throughput_analyzer_unittest.cc
@@ -16,7 +16,6 @@
#include "base/bind_helpers.h"
#include "base/containers/circular_deque.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
diff --git a/net/ntlm/ntlm.cc b/net/ntlm/ntlm.cc
index 728a9b7..0196515 100644
--- a/net/ntlm/ntlm.cc
+++ b/net/ntlm/ntlm.cc
@@ -6,8 +6,9 @@
#include <string.h>
+#include "base/check_op.h"
#include "base/containers/span.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/utf_string_conversions.h"
#include "net/base/net_string_util.h"
#include "net/ntlm/ntlm_buffer_writer.h"
diff --git a/net/ntlm/ntlm_buffer_reader.cc b/net/ntlm/ntlm_buffer_reader.cc
index a5d1a27..e2896cb8 100644
--- a/net/ntlm/ntlm_buffer_reader.cc
+++ b/net/ntlm/ntlm_buffer_reader.cc
@@ -6,7 +6,7 @@
#include <string.h>
-#include "base/logging.h"
+#include "base/check_op.h"
namespace net {
namespace ntlm {
diff --git a/net/ntlm/ntlm_buffer_writer.cc b/net/ntlm/ntlm_buffer_writer.cc
index 0a1a80353..8fec1ee8 100644
--- a/net/ntlm/ntlm_buffer_writer.cc
+++ b/net/ntlm/ntlm_buffer_writer.cc
@@ -8,7 +8,7 @@
#include <limits>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
diff --git a/net/ntlm/ntlm_client.cc b/net/ntlm/ntlm_client.cc
index f2723690..0e9cbf4 100644
--- a/net/ntlm/ntlm_client.cc
+++ b/net/ntlm/ntlm_client.cc
@@ -6,8 +6,8 @@
#include <string.h>
+#include "base/check_op.h"
#include "base/containers/span.h"
-#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
#include "net/ntlm/ntlm.h"
#include "net/ntlm/ntlm_buffer_reader.h"
diff --git a/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
index 41ca6a0..9b129ee 100644
--- a/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
+++ b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
@@ -9,8 +9,8 @@
#include <vector>
#include "base/bind.h"
+#include "base/check.h"
#include "base/format_macros.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
diff --git a/net/proxy_resolution/mock_pac_file_fetcher.cc b/net/proxy_resolution/mock_pac_file_fetcher.cc
index ee67761..e74d938 100644
--- a/net/proxy_resolution/mock_pac_file_fetcher.cc
+++ b/net/proxy_resolution/mock_pac_file_fetcher.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/run_loop.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/net/proxy_resolution/mock_proxy_resolver.cc b/net/proxy_resolution/mock_proxy_resolver.cc
index fa9a1ee..46a8b8f 100644
--- a/net/proxy_resolution/mock_proxy_resolver.cc
+++ b/net/proxy_resolution/mock_proxy_resolver.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
namespace net {
diff --git a/net/proxy_resolution/pac_file_data.cc b/net/proxy_resolution/pac_file_data.cc
index e96d273..fdbccba8 100644
--- a/net/proxy_resolution/pac_file_data.cc
+++ b/net/proxy_resolution/pac_file_data.cc
@@ -4,7 +4,7 @@
#include "net/proxy_resolution/pac_file_data.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/utf_string_conversions.h"
namespace net {
diff --git a/net/proxy_resolution/pac_file_decider.cc b/net/proxy_resolution/pac_file_decider.cc
index 1b32b421..b5ddde9 100644
--- a/net/proxy_resolution/pac_file_decider.cc
+++ b/net/proxy_resolution/pac_file_decider.cc
@@ -8,10 +8,11 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/format_macros.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_config.cc
index da46306..2619562 100644
--- a/net/proxy_resolution/proxy_config.cc
+++ b/net/proxy_resolution/proxy_config.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/string_tokenizer.h"
#include "base/strings/string_util.h"
#include "base/values.h"
diff --git a/net/proxy_resolution/proxy_config_service_android.cc b/net/proxy_resolution/proxy_config_service_android.cc
index 94008ee..93e0938 100644
--- a/net/proxy_resolution/proxy_config_service_android.cc
+++ b/net/proxy_resolution/proxy_config_service_android.cc
@@ -10,9 +10,9 @@
#include "base/android/jni_string.h"
#include "base/bind.h"
#include "base/callback.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/observer_list.h"
diff --git a/net/proxy_resolution/proxy_config_service_linux_unittest.cc b/net/proxy_resolution/proxy_config_service_linux_unittest.cc
index cea50888..c824ca0 100644
--- a/net/proxy_resolution/proxy_config_service_linux_unittest.cc
+++ b/net/proxy_resolution/proxy_config_service_linux_unittest.cc
@@ -9,12 +9,12 @@
#include <vector>
#include "base/bind.h"
+#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/format_macros.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/message_loop/message_pump_type.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
diff --git a/net/proxy_resolution/proxy_list.cc b/net/proxy_resolution/proxy_list.cc
index 91a5279..c0b2c61 100644
--- a/net/proxy_resolution/proxy_list.cc
+++ b/net/proxy_resolution/proxy_list.cc
@@ -5,7 +5,8 @@
#include "net/proxy_resolution/proxy_list.h"
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "base/strings/string_tokenizer.h"
#include "base/time/time.h"
#include "base/values.h"
diff --git a/net/proxy_resolution/proxy_resolver_mac.cc b/net/proxy_resolution/proxy_resolver_mac.cc
index 768f07008..4df7d7d4 100644
--- a/net/proxy_resolution/proxy_resolver_mac.cc
+++ b/net/proxy_resolution/proxy_resolver_mac.cc
@@ -6,8 +6,8 @@
#include <CoreFoundation/CoreFoundation.h>
+#include "base/check.h"
#include "base/lazy_instance.h"
-#include "base/logging.h"
#include "base/mac/foundation_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/strings/string_util.h"
diff --git a/net/proxy_resolution/win/dhcpcsvc_init_win.cc b/net/proxy_resolution/win/dhcpcsvc_init_win.cc
index d4cf6bc5..d9a7c66 100644
--- a/net/proxy_resolution/win/dhcpcsvc_init_win.cc
+++ b/net/proxy_resolution/win/dhcpcsvc_init_win.cc
@@ -4,8 +4,8 @@
#include "net/proxy_resolution/win/dhcpcsvc_init_win.h"
+#include "base/check_op.h"
#include "base/lazy_instance.h"
-#include "base/logging.h"
#include <windows.h> // Must be in front of other Windows header files.
diff --git a/net/quic/crypto_test_utils_chromium.cc b/net/quic/crypto_test_utils_chromium.cc
index dd86b0f..1546480 100644
--- a/net/quic/crypto_test_utils_chromium.cc
+++ b/net/quic/crypto_test_utils_chromium.cc
@@ -5,7 +5,7 @@
#include <utility>
#include "base/callback_helpers.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/stl_util.h"
diff --git a/net/quic/quic_address_mismatch.cc b/net/quic/quic_address_mismatch.cc
index 9a26c2652..16df1eb 100644
--- a/net/quic/quic_address_mismatch.cc
+++ b/net/quic/quic_address_mismatch.cc
@@ -4,7 +4,7 @@
#include "net/quic/quic_address_mismatch.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/base/ip_address.h"
namespace net {
diff --git a/net/quic/quic_chromium_alarm_factory.cc b/net/quic/quic_chromium_alarm_factory.cc
index 2eaf0bf..d3102e9 100644
--- a/net/quic/quic_chromium_alarm_factory.cc
+++ b/net/quic/quic_chromium_alarm_factory.cc
@@ -5,8 +5,8 @@
#include "net/quic/quic_chromium_alarm_factory.h"
#include "base/bind.h"
+#include "base/check.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/sparse_histogram.h"
#include "base/task_runner.h"
#include "base/time/time.h"
diff --git a/net/quic/quic_chromium_packet_writer.cc b/net/quic/quic_chromium_packet_writer.cc
index 143c298..2c5d194df 100644
--- a/net/quic/quic_chromium_packet_writer.cc
+++ b/net/quic/quic_chromium_packet_writer.cc
@@ -8,8 +8,8 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/sparse_histogram.h"
#include "net/base/io_buffer.h"
diff --git a/net/reporting/reporting_delivery_agent.cc b/net/reporting/reporting_delivery_agent.cc
index a5a2c49..fca2421 100644
--- a/net/reporting/reporting_delivery_agent.cc
+++ b/net/reporting/reporting_delivery_agent.cc
@@ -11,8 +11,8 @@
#include <vector>
#include "base/bind.h"
+#include "base/check.h"
#include "base/json/json_writer.h"
-#include "base/logging.h"
#include "base/time/tick_clock.h"
#include "base/timer/timer.h"
#include "base/values.h"
diff --git a/net/reporting/reporting_endpoint_manager.cc b/net/reporting/reporting_endpoint_manager.cc
index 35652768e..c903335 100644
--- a/net/reporting/reporting_endpoint_manager.cc
+++ b/net/reporting/reporting_endpoint_manager.cc
@@ -10,9 +10,10 @@
#include <utility>
#include <vector>
+#include "base/check.h"
#include "base/containers/mru_cache.h"
-#include "base/logging.h"
#include "base/macros.h"
+#include "base/notreached.h"
#include "base/rand_util.h"
#include "base/stl_util.h"
#include "base/time/tick_clock.h"
diff --git a/net/reporting/reporting_header_parser.cc b/net/reporting/reporting_header_parser.cc
index e6f6d34..294f903 100644
--- a/net/reporting/reporting_header_parser.cc
+++ b/net/reporting/reporting_header_parser.cc
@@ -10,8 +10,8 @@
#include <vector>
#include "base/bind.h"
+#include "base/check.h"
#include "base/json/json_reader.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/time/time.h"
#include "base/values.h"
diff --git a/net/reporting/reporting_test_util.cc b/net/reporting/reporting_test_util.cc
index 490231d3..47ebd724 100644
--- a/net/reporting/reporting_test_util.cc
+++ b/net/reporting/reporting_test_util.cc
@@ -9,9 +9,10 @@
#include <vector>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/json/json_reader.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
+#include "base/notreached.h"
#include "base/strings/stringprintf.h"
#include "base/test/simple_test_clock.h"
#include "base/test/simple_test_tick_clock.h"
diff --git a/net/server/http_server_fuzzer.cc b/net/server/http_server_fuzzer.cc
index 0509bde4c..3bee3fa 100644
--- a/net/server/http_server_fuzzer.cc
+++ b/net/server/http_server_fuzzer.cc
@@ -4,7 +4,7 @@
#include <fuzzer/FuzzedDataProvider.h>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "net/base/net_errors.h"
diff --git a/net/server/http_server_unittest.cc b/net/server/http_server_unittest.cc
index 509ece87..824dbe4 100644
--- a/net/server/http_server_unittest.cc
+++ b/net/server/http_server_unittest.cc
@@ -15,13 +15,14 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback_helpers.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/format_macros.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
+#include "base/notreached.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
diff --git a/net/server/web_socket.cc b/net/server/web_socket.cc
index 60d9074..89f4be2 100644
--- a/net/server/web_socket.cc
+++ b/net/server/web_socket.cc
@@ -7,8 +7,8 @@
#include <vector>
#include "base/base64.h"
+#include "base/check.h"
#include "base/hash/sha1.h"
-#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/sys_byteorder.h"
diff --git a/net/server/web_socket_encoder.cc b/net/server/web_socket_encoder.cc
index e6d4c642..760ff6b9e 100644
--- a/net/server/web_socket_encoder.cc
+++ b/net/server/web_socket_encoder.cc
@@ -8,7 +8,7 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "net/base/io_buffer.h"
diff --git a/net/socket/client_socket_handle.cc b/net/socket/client_socket_handle.cc
index f23033c..f269dce 100644
--- a/net/socket/client_socket_handle.cc
+++ b/net/socket/client_socket_handle.cc
@@ -8,8 +8,9 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/trace_event/trace_event.h"
#include "net/base/net_errors.h"
#include "net/base/trace_constants.h"
diff --git a/net/socket/client_socket_pool.cc b/net/socket/client_socket_pool.cc
index 8e9f7e60..d1ea3f3 100644
--- a/net/socket/client_socket_pool.cc
+++ b/net/socket/client_socket_pool.cc
@@ -7,8 +7,8 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/feature_list.h"
-#include "base/logging.h"
#include "net/base/features.h"
#include "net/http/http_proxy_connect_job.h"
#include "net/log/net_log_event_type.h"
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index 831ef5b3..be3196e 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -11,10 +11,11 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
+#include "base/notreached.h"
#include "base/optional.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
index 84e6de66..7e3e696 100644
--- a/net/socket/client_socket_pool_manager.cc
+++ b/net/socket/client_socket_pool_manager.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/field_trial_params.h"
#include "base/optional.h"
#include "base/stl_util.h"
diff --git a/net/socket/client_socket_pool_manager_impl.cc b/net/socket/client_socket_pool_manager_impl.cc
index d1835a5..0d7a1511 100644
--- a/net/socket/client_socket_pool_manager_impl.cc
+++ b/net/socket/client_socket_pool_manager_impl.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/values.h"
#include "net/base/proxy_server.h"
#include "net/http/http_network_session.h"
diff --git a/net/socket/connect_job_test_util.cc b/net/socket/connect_job_test_util.cc
index 45120b9..12f3ae2 100644
--- a/net/socket/connect_job_test_util.cc
+++ b/net/socket/connect_job_test_util.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/run_loop.h"
#include "net/socket/stream_socket.h"
#include "net/test/gtest_util.h"
diff --git a/net/socket/connect_job_unittest.cc b/net/socket/connect_job_unittest.cc
index 8c82655..4f1c8e9 100644
--- a/net/socket/connect_job_unittest.cc
+++ b/net/socket/connect_job_unittest.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/net/socket/fuzzed_datagram_client_socket.cc b/net/socket/fuzzed_datagram_client_socket.cc
index 4e8a7107..897332e 100644
--- a/net/socket/fuzzed_datagram_client_socket.cc
+++ b/net/socket/fuzzed_datagram_client_socket.cc
@@ -10,8 +10,8 @@
#include <string>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/strings/string_piece.h"
#include "base/threading/thread_task_runner_handle.h"
#include "net/base/io_buffer.h"
diff --git a/net/socket/fuzzed_socket.cc b/net/socket/fuzzed_socket.cc
index c56543f..abdaeea 100644
--- a/net/socket/fuzzed_socket.cc
+++ b/net/socket/fuzzed_socket.cc
@@ -9,8 +9,9 @@
#include <algorithm>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/threading/thread_task_runner_handle.h"
#include "net/base/io_buffer.h"
#include "net/log/net_log_source_type.h"
diff --git a/net/socket/fuzzed_socket_factory.cc b/net/socket/fuzzed_socket_factory.cc
index 2b2a70e3..fb2d12c 100644
--- a/net/socket/fuzzed_socket_factory.cc
+++ b/net/socket/fuzzed_socket_factory.cc
@@ -6,7 +6,7 @@
#include <fuzzer/FuzzedDataProvider.h>
-#include "base/logging.h"
+#include "base/notreached.h"
#include "net/base/address_list.h"
#include "net/base/ip_endpoint.h"
#include "net/base/net_errors.h"
diff --git a/net/socket/read_buffering_stream_socket.cc b/net/socket/read_buffering_stream_socket.cc
index c60ac1b..b56d554 100644
--- a/net/socket/read_buffering_stream_socket.cc
+++ b/net/socket/read_buffering_stream_socket.cc
@@ -6,7 +6,8 @@
#include <algorithm>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "net/base/io_buffer.h"
namespace net {
diff --git a/net/socket/socket_bio_adapter.cc b/net/socket/socket_bio_adapter.cc
index 182b9d6..8ff8c58 100644
--- a/net/socket/socket_bio_adapter.cc
+++ b/net/socket/socket_bio_adapter.cc
@@ -9,8 +9,9 @@
#include <algorithm>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/threading/thread_task_runner_handle.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
diff --git a/net/socket/socket_bio_adapter_unittest.cc b/net/socket/socket_bio_adapter_unittest.cc
index 4dcde7b..f45056b 100644
--- a/net/socket/socket_bio_adapter_unittest.cc
+++ b/net/socket/socket_bio_adapter_unittest.cc
@@ -8,9 +8,9 @@
#include <memory>
+#include "base/check_op.h"
#include "base/containers/span.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "crypto/openssl_util.h"
diff --git a/net/socket/socket_tag.cc b/net/socket/socket_tag.cc
index ad550a0..7bf19b7 100644
--- a/net/socket/socket_tag.cc
+++ b/net/socket/socket_tag.cc
@@ -6,7 +6,7 @@
#include <tuple>
-#include "base/logging.h"
+#include "base/check.h"
#if defined(OS_ANDROID)
#include "net/android/network_library.h"
diff --git a/net/socket/socks5_client_socket_fuzzer.cc b/net/socket/socks5_client_socket_fuzzer.cc
index 6e79976..eb480d356 100644
--- a/net/socket/socks5_client_socket_fuzzer.cc
+++ b/net/socket/socks5_client_socket_fuzzer.cc
@@ -9,7 +9,7 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/base/address_list.h"
#include "net/base/net_errors.h"
diff --git a/net/socket/socks_client_socket_fuzzer.cc b/net/socket/socks_client_socket_fuzzer.cc
index ebf9849..245e8a3 100644
--- a/net/socket/socks_client_socket_fuzzer.cc
+++ b/net/socket/socks_client_socket_fuzzer.cc
@@ -9,7 +9,7 @@
#include <memory>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/base/address_list.h"
#include "net/base/net_errors.h"
#include "net/base/network_isolation_key.h"
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc
index b0ee305..c2b3325b 100644
--- a/net/socket/ssl_server_socket_unittest.cc
+++ b/net/socket/ssl_server_socket_unittest.cc
@@ -21,12 +21,13 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
+#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/containers/queue.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
diff --git a/net/socket/stream_socket.cc b/net/socket/stream_socket.cc
index e9e2920..0665afb 100644
--- a/net/socket/stream_socket.cc
+++ b/net/socket/stream_socket.cc
@@ -4,7 +4,7 @@
#include "net/socket/stream_socket.h"
-#include "base/logging.h"
+#include "base/notreached.h"
namespace net {
diff --git a/net/socket/tcp_client_socket.cc b/net/socket/tcp_client_socket.cc
index 46d0a7d..551fc96 100644
--- a/net/socket/tcp_client_socket.cc
+++ b/net/socket/tcp_client_socket.cc
@@ -8,9 +8,10 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/time/time.h"
#include "net/base/io_buffer.h"
#include "net/base/ip_endpoint.h"
diff --git a/net/socket/tcp_server_socket.cc b/net/socket/tcp_server_socket.cc
index 133715434..3b9624b 100644
--- a/net/socket/tcp_server_socket.cc
+++ b/net/socket/tcp_server_socket.cc
@@ -8,7 +8,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
#include "net/base/net_errors.h"
#include "net/socket/socket_descriptor.h"
#include "net/socket/tcp_client_socket.h"
diff --git a/net/socket/transport_client_socket_pool.cc b/net/socket/transport_client_socket_pool.cc
index c7d64949..3d5aff5 100644
--- a/net/socket/transport_client_socket_pool.cc
+++ b/net/socket/transport_client_socket_pool.cc
@@ -8,12 +8,13 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/format_macros.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
diff --git a/net/socket/transport_client_socket_pool_test_util.cc b/net/socket/transport_client_socket_pool_test_util.cc
index 1815967..cdaecf2 100644
--- a/net/socket/transport_client_socket_pool_test_util.cc
+++ b/net/socket/transport_client_socket_pool_test_util.cc
@@ -9,10 +9,11 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
+#include "base/notreached.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/net/socket/transport_connect_job.cc b/net/socket/transport_connect_job.cc
index 9d682e9..14aa2783 100644
--- a/net/socket/transport_connect_job.cc
+++ b/net/socket/transport_connect_job.cc
@@ -8,9 +8,10 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/strings/string_util.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/trace_event/trace_event.h"
diff --git a/net/socket/udp_socket_win.cc b/net/socket/udp_socket_win.cc
index 0d08043..f58a2b4 100644
--- a/net/socket/udp_socket_win.cc
+++ b/net/socket/udp_socket_win.cc
@@ -8,11 +8,12 @@
#include "base/bind.h"
#include "base/callback.h"
+#include "base/check_op.h"
#include "base/lazy_instance.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/rand_util.h"
#include "base/task/post_task.h"
#include "base/task/thread_pool.h"
diff --git a/net/socket/unix_domain_client_socket_posix.cc b/net/socket/unix_domain_client_socket_posix.cc
index d0e4b3c5..d9079da 100644
--- a/net/socket/unix_domain_client_socket_posix.cc
+++ b/net/socket/unix_domain_client_socket_posix.cc
@@ -8,7 +8,8 @@
#include <sys/un.h>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "net/base/net_errors.h"
#include "net/base/sockaddr_storage.h"
#include "net/socket/socket_posix.h"
diff --git a/net/socket/websocket_endpoint_lock_manager_unittest.cc b/net/socket/websocket_endpoint_lock_manager_unittest.cc
index 8c3fcc1..85d9929b 100644
--- a/net/socket/websocket_endpoint_lock_manager_unittest.cc
+++ b/net/socket/websocket_endpoint_lock_manager_unittest.cc
@@ -4,7 +4,7 @@
#include "net/socket/websocket_endpoint_lock_manager.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "base/time/time.h"
diff --git a/net/socket/websocket_transport_client_socket_pool.cc b/net/socket/websocket_transport_client_socket_pool.cc
index 9a46a62..d153655 100644
--- a/net/socket/websocket_transport_client_socket_pool.cc
+++ b/net/socket/websocket_transport_client_socket_pool.cc
@@ -8,9 +8,10 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/location.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_util.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/net/socket/websocket_transport_connect_sub_job.cc b/net/socket/websocket_transport_connect_sub_job.cc
index aea2802..40bbb3a 100644
--- a/net/socket/websocket_transport_connect_sub_job.cc
+++ b/net/socket/websocket_transport_connect_sub_job.cc
@@ -5,7 +5,8 @@
#include "net/socket/websocket_transport_connect_sub_job.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "net/base/ip_endpoint.h"
#include "net/base/net_errors.h"
#include "net/log/net_log_with_source.h"
diff --git a/net/spdy/buffered_spdy_framer.cc b/net/spdy/buffered_spdy_framer.cc
index ec01527..484a860c 100644
--- a/net/spdy/buffered_spdy_framer.cc
+++ b/net/spdy/buffered_spdy_framer.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/strings/string_util.h"
#include "base/trace_event/memory_usage_estimator.h"
diff --git a/net/spdy/multiplexed_http_stream.cc b/net/spdy/multiplexed_http_stream.cc
index f47dc97..9d89e6e 100644
--- a/net/spdy/multiplexed_http_stream.cc
+++ b/net/spdy/multiplexed_http_stream.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/notreached.h"
#include "net/http/http_raw_request_headers.h"
#include "net/third_party/quiche/src/spdy/core/spdy_header_block.h"
diff --git a/net/spdy/spdy_buffer.cc b/net/spdy/spdy_buffer.cc
index f286b28e..dbec2fa 100644
--- a/net/spdy/spdy_buffer.cc
+++ b/net/spdy/spdy_buffer.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/callback.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/macros.h"
#include "base/trace_event/memory_usage_estimator.h"
#include "net/base/io_buffer.h"
diff --git a/net/spdy/spdy_buffer_producer.cc b/net/spdy/spdy_buffer_producer.cc
index 355f5ce..b5fd442f 100644
--- a/net/spdy/spdy_buffer_producer.cc
+++ b/net/spdy/spdy_buffer_producer.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/trace_event/memory_usage_estimator.h"
#include "net/spdy/spdy_buffer.h"
#include "net/third_party/quiche/src/spdy/core/spdy_protocol.h"
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index 85e4e32f..8b2c6b2 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -10,8 +10,8 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc
index c7621eb..ef9682e 100644
--- a/net/spdy/spdy_proxy_client_socket.cc
+++ b/net/spdy/spdy_proxy_client_socket.cc
@@ -10,8 +10,9 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback_helpers.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 "base/strings/string_util.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/net/spdy/spdy_read_queue.cc b/net/spdy/spdy_read_queue.cc
index 0c1eaf5d..48ace9b 100644
--- a/net/spdy/spdy_read_queue.cc
+++ b/net/spdy/spdy_read_queue.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <utility>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/spdy/spdy_buffer.h"
namespace net {
diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
index 3a452f0..39e8183 100644
--- a/net/spdy/spdy_session_pool.cc
+++ b/net/spdy/spdy_session_pool.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index 33f930a..ba8ffe6 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -9,11 +9,12 @@
#include <utility>
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
+#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
index addad6599..1688a47 100644
--- a/net/spdy/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc
@@ -9,8 +9,9 @@
#include "base/base64.h"
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/optional.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
diff --git a/net/spdy/spdy_write_queue.cc b/net/spdy/spdy_write_queue.cc
index e402e97b..622fcd4 100644
--- a/net/spdy/spdy_write_queue.cc
+++ b/net/spdy/spdy_write_queue.cc
@@ -8,8 +8,8 @@
#include <utility>
#include <vector>
+#include "base/check_op.h"
#include "base/containers/circular_deque.h"
-#include "base/logging.h"
#include "base/trace_event/memory_usage_estimator.h"
#include "net/spdy/spdy_buffer.h"
#include "net/spdy/spdy_buffer_producer.h"
diff --git a/net/spdy/spdy_write_queue_unittest.cc b/net/spdy/spdy_write_queue_unittest.cc
index aad01687..c8f2296 100644
--- a/net/spdy/spdy_write_queue_unittest.cc
+++ b/net/spdy/spdy_write_queue_unittest.cc
@@ -10,8 +10,8 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
#include "base/memory/ref_counted.h"
+#include "base/notreached.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "net/base/request_priority.h"
diff --git a/net/ssl/ssl_cipher_suite_names.cc b/net/ssl/ssl_cipher_suite_names.cc
index 1156ff17..fb852b7d 100644
--- a/net/ssl/ssl_cipher_suite_names.cc
+++ b/net/ssl/ssl_cipher_suite_names.cc
@@ -4,7 +4,7 @@
#include "net/ssl/ssl_cipher_suite_names.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "net/ssl/ssl_connection_status_flags.h"
diff --git a/net/ssl/ssl_client_auth_cache.cc b/net/ssl/ssl_client_auth_cache.cc
index e8c05fc9..13fd956 100644
--- a/net/ssl/ssl_client_auth_cache.cc
+++ b/net/ssl/ssl_client_auth_cache.cc
@@ -4,7 +4,7 @@
#include "net/ssl/ssl_client_auth_cache.h"
-#include "base/logging.h"
+#include "base/check.h"
#include "net/cert/x509_certificate.h"
#include "net/ssl/ssl_private_key.h"
diff --git a/net/ssl/ssl_private_key.cc b/net/ssl/ssl_private_key.cc
index 011c72d..fe71104c 100644
--- a/net/ssl/ssl_private_key.cc
+++ b/net/ssl/ssl_private_key.cc
@@ -4,7 +4,7 @@
#include "net/ssl/ssl_private_key.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "third_party/boringssl/src/include/openssl/evp.h"
#include "third_party/boringssl/src/include/openssl/ssl.h"
diff --git a/net/ssl/test_ssl_private_key.cc b/net/ssl/test_ssl_private_key.cc
index aad199d..98c8e3f 100644
--- a/net/ssl/test_ssl_private_key.cc
+++ b/net/ssl/test_ssl_private_key.cc
@@ -7,7 +7,6 @@
#include <memory>
#include <utility>
-#include "base/logging.h"
#include "base/macros.h"
#include "crypto/rsa_private_key.h"
#include "net/base/net_errors.h"
diff --git a/net/test/embedded_test_server/controllable_http_response.cc b/net/test/embedded_test_server/controllable_http_response.cc
index f393163..a3fd4996 100644
--- a/net/test/embedded_test_server/controllable_http_response.cc
+++ b/net/test/embedded_test_server/controllable_http_response.cc
@@ -5,7 +5,7 @@
#include "net/test/embedded_test_server/controllable_http_response.h"
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/stringprintf.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/net/test/embedded_test_server/http_response.cc b/net/test/embedded_test_server/http_response.cc
index adf79c5..c4c80f7 100644
--- a/net/test/embedded_test_server/http_response.cc
+++ b/net/test/embedded_test_server/http_response.cc
@@ -7,8 +7,8 @@
#include <utility>
#include "base/bind.h"
+#include "base/check.h"
#include "base/format_macros.h"
-#include "base/logging.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/threading/sequenced_task_runner_handle.h"
diff --git a/net/test/net_test_suite.cc b/net/test/net_test_suite.cc
index 98082e8..e5ef64c3 100644
--- a/net/test/net_test_suite.cc
+++ b/net/test/net_test_suite.cc
@@ -4,7 +4,7 @@
#include "net/test/net_test_suite.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/base/network_change_notifier.h"
#include "net/http/http_stream_factory.h"
#include "net/spdy/spdy_session.h"
diff --git a/net/test/scoped_disable_exit_on_dfatal.cc b/net/test/scoped_disable_exit_on_dfatal.cc
index 3484c46..cc4c668 100644
--- a/net/test/scoped_disable_exit_on_dfatal.cc
+++ b/net/test/scoped_disable_exit_on_dfatal.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "base/logging.h"
#include "base/strings/string_piece.h"
namespace net {
diff --git a/net/test/url_request/url_request_failed_job.cc b/net/test/url_request/url_request_failed_job.cc
index 3000861..93e1114 100644
--- a/net/test/url_request/url_request_failed_job.cc
+++ b/net/test/url_request/url_request_failed_job.cc
@@ -5,8 +5,8 @@
#include "net/test/url_request/url_request_failed_job.h"
#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/stl_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/test/url_request/url_request_test_job_backed_by_file_unittest.cc b/net/test/url_request/url_request_test_job_backed_by_file_unittest.cc
index 2f18b20..50f2007 100644
--- a/net/test/url_request/url_request_test_job_backed_by_file_unittest.cc
+++ b/net/test/url_request/url_request_test_job_backed_by_file_unittest.cc
@@ -6,10 +6,10 @@
#include <memory>
+#include "base/check.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/logging.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/net/tools/cert_verify_tool/cert_verify_tool_util.cc b/net/tools/cert_verify_tool/cert_verify_tool_util.cc
index f2b09c1..95aa01c 100644
--- a/net/tools/cert_verify_tool/cert_verify_tool_util.cc
+++ b/net/tools/cert_verify_tool/cert_verify_tool_util.cc
@@ -7,7 +7,6 @@
#include <iostream>
#include "base/files/file_util.h"
-#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "build/build_config.h"
#include "net/cert/pem.h"
diff --git a/net/tools/cert_verify_tool/verify_using_path_builder.cc b/net/tools/cert_verify_tool/verify_using_path_builder.cc
index 3088739..6a3801b 100644
--- a/net/tools/cert_verify_tool/verify_using_path_builder.cc
+++ b/net/tools/cert_verify_tool/verify_using_path_builder.cc
@@ -7,7 +7,6 @@
#include <iostream>
#include <memory>
-#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "crypto/sha2.h"
diff --git a/net/tools/crash_cache/crash_cache.cc b/net/tools/crash_cache/crash_cache.cc
index 44fef74..358e29f5 100644
--- a/net/tools/crash_cache/crash_cache.cc
+++ b/net/tools/crash_cache/crash_cache.cc
@@ -10,9 +10,9 @@
#include <string>
#include "base/at_exit.h"
+#include "base/check.h"
#include "base/command_line.h"
#include "base/files/file_util.h"
-#include "base/logging.h"
#include "base/message_loop/message_pump_type.h"
#include "base/path_service.h"
#include "base/process/kill.h"
diff --git a/net/tools/huffman_trie/bit_writer.cc b/net/tools/huffman_trie/bit_writer.cc
index 1b238f4..74f5e5e 100644
--- a/net/tools/huffman_trie/bit_writer.cc
+++ b/net/tools/huffman_trie/bit_writer.cc
@@ -4,7 +4,7 @@
#include "net/tools/huffman_trie/bit_writer.h"
-#include "base/logging.h"
+#include "base/check.h"
namespace net {
diff --git a/net/tools/huffman_trie/huffman/huffman_builder.cc b/net/tools/huffman_trie/huffman/huffman_builder.cc
index b1124c6..8551d8e 100644
--- a/net/tools/huffman_trie/huffman/huffman_builder.cc
+++ b/net/tools/huffman_trie/huffman/huffman_builder.cc
@@ -5,8 +5,9 @@
#include "net/tools/huffman_trie/huffman/huffman_builder.h"
#include <algorithm>
+#include <ostream>
-#include "base/logging.h"
+#include "base/check.h"
namespace net {
diff --git a/net/tools/huffman_trie/trie/trie_bit_buffer.cc b/net/tools/huffman_trie/trie/trie_bit_buffer.cc
index 3e3ef70..88e38b4 100644
--- a/net/tools/huffman_trie/trie/trie_bit_buffer.cc
+++ b/net/tools/huffman_trie/trie/trie_bit_buffer.cc
@@ -4,7 +4,9 @@
#include "net/tools/huffman_trie/trie/trie_bit_buffer.h"
-#include "base/logging.h"
+#include <ostream>
+
+#include "base/check.h"
#include "net/tools/huffman_trie/bit_writer.h"
namespace net {
diff --git a/net/tools/huffman_trie/trie/trie_writer.cc b/net/tools/huffman_trie/trie/trie_writer.cc
index 54021663e..6c4ff8b 100644
--- a/net/tools/huffman_trie/trie/trie_writer.cc
+++ b/net/tools/huffman_trie/trie/trie_writer.cc
@@ -5,8 +5,9 @@
#include "net/tools/huffman_trie/trie/trie_writer.h"
#include <algorithm>
+#include <ostream>
-#include "base/logging.h"
+#include "base/check.h"
#include "net/tools/huffman_trie/trie/trie_bit_buffer.h"
namespace net {
diff --git a/net/tools/quic/quic_simple_client.cc b/net/tools/quic/quic_simple_client.cc
index ee8d31e..5d8bf33 100644
--- a/net/tools/quic/quic_simple_client.cc
+++ b/net/tools/quic/quic_simple_client.cc
@@ -6,7 +6,6 @@
#include <utility>
-#include "base/logging.h"
#include "base/run_loop.h"
#include "base/threading/thread_task_runner_handle.h"
#include "net/base/net_errors.h"
diff --git a/net/tools/quic/quic_simple_server_packet_writer.cc b/net/tools/quic/quic_simple_server_packet_writer.cc
index 648689ab..b4599eba 100644
--- a/net/tools/quic/quic_simple_server_packet_writer.cc
+++ b/net/tools/quic/quic_simple_server_packet_writer.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/metrics/histogram_functions.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
diff --git a/net/tools/transport_security_state_generator/spki_hash.cc b/net/tools/transport_security_state_generator/spki_hash.cc
index 1fcc61e..6374aed 100644
--- a/net/tools/transport_security_state_generator/spki_hash.cc
+++ b/net/tools/transport_security_state_generator/spki_hash.cc
@@ -7,7 +7,6 @@
#include <string>
#include "base/base64.h"
-#include "base/logging.h"
#include "base/strings/string_util.h"
#include "third_party/boringssl/src/include/openssl/sha.h"
diff --git a/net/url_request/ftp_protocol_handler.cc b/net/url_request/ftp_protocol_handler.cc
index 4b96c5a..1adbb8a 100644
--- a/net/url_request/ftp_protocol_handler.cc
+++ b/net/url_request/ftp_protocol_handler.cc
@@ -4,7 +4,7 @@
#include "net/url_request/ftp_protocol_handler.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/memory/ptr_util.h"
#include "net/base/net_errors.h"
#include "net/base/port_util.h"
diff --git a/net/url_request/http_with_dns_over_https_unittest.cc b/net/url_request/http_with_dns_over_https_unittest.cc
index f74083f..4e21e25 100644
--- a/net/url_request/http_with_dns_over_https_unittest.cc
+++ b/net/url_request/http_with_dns_over_https_unittest.cc
@@ -4,7 +4,6 @@
#include "base/big_endian.h"
#include "base/bind.h"
-#include "base/logging.h"
#include "base/memory/scoped_refptr.h"
#include "net/base/privacy_mode.h"
#include "net/base/proxy_server.h"
diff --git a/net/url_request/url_fetcher_core.cc b/net/url_request/url_fetcher_core.cc
index 8861e700..f4e1f4b 100644
--- a/net/url_request/url_fetcher_core.cc
+++ b/net/url_request/url_fetcher_core.cc
@@ -9,7 +9,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/sequenced_task_runner.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index 6bc7ae4..943423b 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -8,9 +8,10 @@
#include <utility>
#include <vector>
+#include "base/check_op.h"
#include "base/compiler_specific.h"
-#include "base/logging.h"
#include "base/macros.h"
+#include "base/notreached.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string_util.h"
#include "base/task/post_task.h"
diff --git a/net/url_request/url_request_context_storage.cc b/net/url_request/url_request_context_storage.cc
index 258c570..746fc67 100644
--- a/net/url_request/url_request_context_storage.cc
+++ b/net/url_request/url_request_context_storage.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "net/base/http_user_agent_settings.h"
#include "net/base/network_delegate.h"
#include "net/base/proxy_delegate.h"
diff --git a/net/url_request/url_request_redirect_job.cc b/net/url_request/url_request_redirect_job.cc
index 76f5582..58fefd34 100644
--- a/net/url_request/url_request_redirect_job.cc
+++ b/net/url_request/url_request_redirect_job.cc
@@ -7,9 +7,9 @@
#include <string>
#include "base/bind.h"
+#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/stringprintf.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/net/url_request/url_request_status.cc b/net/url_request/url_request_status.cc
index 7207df2f..a29fbee 100644
--- a/net/url_request/url_request_status.cc
+++ b/net/url_request/url_request_status.cc
@@ -4,7 +4,8 @@
#include "net/url_request/url_request_status.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "net/base/net_errors.h"
namespace net {
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 25ba0ef..a4fa510 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -6,9 +6,9 @@
#include <utility>
+#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/location.h"
-#include "base/logging.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/supports_user_data.h"
diff --git a/net/url_request/url_request_throttler_entry.cc b/net/url_request/url_request_throttler_entry.cc
index 9f8ddc7b..c50ed00 100644
--- a/net/url_request/url_request_throttler_entry.cc
+++ b/net/url_request/url_request_throttler_entry.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram_macros.h"
#include "base/rand_util.h"
diff --git a/net/url_request/url_request_throttler_manager.cc b/net/url_request/url_request_throttler_manager.cc
index 9b91c88..1aff5e8 100644
--- a/net/url_request/url_request_throttler_manager.cc
+++ b/net/url_request/url_request_throttler_manager.cc
@@ -4,7 +4,7 @@
#include "net/url_request/url_request_throttler_manager.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/strings/string_util.h"
#include "net/base/url_util.h"
#include "net/log/net_log.h"
diff --git a/net/websockets/websocket_basic_handshake_stream.cc b/net/websockets/websocket_basic_handshake_stream.cc
index b3db99c..692b61a 100644
--- a/net/websockets/websocket_basic_handshake_stream.cc
+++ b/net/websockets/websocket_basic_handshake_stream.cc
@@ -12,8 +12,8 @@
#include "base/base64.h"
#include "base/bind.h"
+#include "base/check_op.h"
#include "base/compiler_specific.h"
-#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/websockets/websocket_basic_handshake_stream_test.cc b/net/websockets/websocket_basic_handshake_stream_test.cc
index 06dc980c..1df0a16 100644
--- a/net/websockets/websocket_basic_handshake_stream_test.cc
+++ b/net/websockets/websocket_basic_handshake_stream_test.cc
@@ -8,7 +8,6 @@
#include <utility>
#include <vector>
-#include "base/logging.h"
#include "net/base/address_list.h"
#include "net/base/ip_address.h"
#include "net/base/ip_endpoint.h"
diff --git a/net/websockets/websocket_deflate_stream_fuzzer.cc b/net/websockets/websocket_deflate_stream_fuzzer.cc
index 3734128..95f74867 100644
--- a/net/websockets/websocket_deflate_stream_fuzzer.cc
+++ b/net/websockets/websocket_deflate_stream_fuzzer.cc
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/scoped_refptr.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
diff --git a/net/websockets/websocket_deflater.cc b/net/websockets/websocket_deflater.cc
index 459b84c..8f93a014 100644
--- a/net/websockets/websocket_deflater.cc
+++ b/net/websockets/websocket_deflater.cc
@@ -8,8 +8,8 @@
#include <algorithm>
#include <vector>
+#include "base/check_op.h"
#include "base/containers/circular_deque.h"
-#include "base/logging.h"
#include "net/base/io_buffer.h"
#include "third_party/zlib/zlib.h"
diff --git a/net/websockets/websocket_errors.cc b/net/websockets/websocket_errors.cc
index b7ca7bc5..eeb0bf52 100644
--- a/net/websockets/websocket_errors.cc
+++ b/net/websockets/websocket_errors.cc
@@ -4,7 +4,6 @@
#include "net/websockets/websocket_errors.h"
-#include "base/logging.h"
namespace net {
diff --git a/net/websockets/websocket_extension.cc b/net/websockets/websocket_extension.cc
index f1d7bf7..96435856 100644
--- a/net/websockets/websocket_extension.cc
+++ b/net/websockets/websocket_extension.cc
@@ -8,7 +8,7 @@
#include <string>
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "net/http/http_util.h"
namespace net {
diff --git a/net/websockets/websocket_extension_parser.cc b/net/websockets/websocket_extension_parser.cc
index 6532ae3..8d673c1e 100644
--- a/net/websockets/websocket_extension_parser.cc
+++ b/net/websockets/websocket_extension_parser.cc
@@ -4,7 +4,7 @@
#include "net/websockets/websocket_extension_parser.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/http/http_util.h"
namespace net {
diff --git a/net/websockets/websocket_frame.cc b/net/websockets/websocket_frame.cc
index 7268f7fc..d858e060 100644
--- a/net/websockets/websocket_frame.cc
+++ b/net/websockets/websocket_frame.cc
@@ -10,7 +10,7 @@
#include <algorithm>
#include "base/big_endian.h"
-#include "base/logging.h"
+#include "base/check_op.h"
#include "base/rand_util.h"
#include "net/base/net_errors.h"
diff --git a/net/websockets/websocket_handshake_stream_create_helper.cc b/net/websockets/websocket_handshake_stream_create_helper.cc
index 5c25a0b..75021b4 100644
--- a/net/websockets/websocket_handshake_stream_create_helper.cc
+++ b/net/websockets/websocket_handshake_stream_create_helper.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/logging.h"
+#include "base/check.h"
#include "base/memory/weak_ptr.h"
#include "net/socket/client_socket_handle.h"
#include "net/websockets/websocket_basic_handshake_stream.h"
diff --git a/net/websockets/websocket_http2_handshake_stream.cc b/net/websockets/websocket_http2_handshake_stream.cc
index 30d1fee..2a81c69 100644
--- a/net/websockets/websocket_http2_handshake_stream.cc
+++ b/net/websockets/websocket_http2_handshake_stream.cc
@@ -8,7 +8,8 @@
#include <utility>
#include "base/bind.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
#include "net/base/ip_endpoint.h"
diff --git a/net/websockets/websocket_inflater.cc b/net/websockets/websocket_inflater.cc
index 6b61f497..c150b5f 100644
--- a/net/websockets/websocket_inflater.cc
+++ b/net/websockets/websocket_inflater.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <vector>
-#include "base/logging.h"
+#include "base/check_op.h"
#include "net/base/io_buffer.h"
#include "third_party/zlib/zlib.h"