[go: nahoru, domu]

Remove/replace unnecessary logging.h includes in .cc files (crypto)

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: Ifb0585f520cde43e15d61e566bf92778dafec5ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2164892
Auto-Submit: Hans Wennborg <hans@chromium.org>
Reviewed-by: David Benjamin <davidben@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#762474}
diff --git a/crypto/ec_private_key.cc b/crypto/ec_private_key.cc
index f8d3b87..28bbe3f 100644
--- a/crypto/ec_private_key.cc
+++ b/crypto/ec_private_key.cc
@@ -9,7 +9,7 @@
 
 #include <utility>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "crypto/openssl_util.h"
 #include "third_party/boringssl/src/include/openssl/bn.h"
 #include "third_party/boringssl/src/include/openssl/bytestring.h"
diff --git a/crypto/ec_signature_creator.cc b/crypto/ec_signature_creator.cc
index 339a81a6..6c723e7 100644
--- a/crypto/ec_signature_creator.cc
+++ b/crypto/ec_signature_creator.cc
@@ -4,7 +4,7 @@
 
 #include "crypto/ec_signature_creator.h"
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "base/memory/ptr_util.h"
 #include "crypto/ec_signature_creator_impl.h"
 
diff --git a/crypto/ec_signature_creator_impl.cc b/crypto/ec_signature_creator_impl.cc
index c3ca35c..d7da650 100644
--- a/crypto/ec_signature_creator_impl.cc
+++ b/crypto/ec_signature_creator_impl.cc
@@ -7,7 +7,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "base/logging.h"
 #include "crypto/ec_private_key.h"
 #include "crypto/openssl_util.h"
 #include "third_party/boringssl/src/include/openssl/bn.h"
diff --git a/crypto/hkdf.cc b/crypto/hkdf.cc
index e3257625..9ebf94b7 100644
--- a/crypto/hkdf.cc
+++ b/crypto/hkdf.cc
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "crypto/hmac.h"
 #include "third_party/boringssl/src/include/openssl/digest.h"
 #include "third_party/boringssl/src/include/openssl/hkdf.h"
diff --git a/crypto/hmac.cc b/crypto/hmac.cc
index bb47081c..58abcfab 100644
--- a/crypto/hmac.cc
+++ b/crypto/hmac.cc
@@ -9,7 +9,8 @@
 #include <algorithm>
 #include <string>
 
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/notreached.h"
 #include "base/stl_util.h"
 #include "crypto/openssl_util.h"
 #include "crypto/secure_util.h"
diff --git a/crypto/mock_apple_keychain.cc b/crypto/mock_apple_keychain.cc
index 6076813..7cf93738 100644
--- a/crypto/mock_apple_keychain.cc
+++ b/crypto/mock_apple_keychain.cc
@@ -4,7 +4,7 @@
 
 #include "crypto/mock_apple_keychain.h"
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
diff --git a/crypto/mock_apple_keychain_ios.cc b/crypto/mock_apple_keychain_ios.cc
index 9e8a164..84194fb 100644
--- a/crypto/mock_apple_keychain_ios.cc
+++ b/crypto/mock_apple_keychain_ios.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/logging.h"
 #include "base/time/time.h"
 #include "crypto/mock_apple_keychain.h"
 
diff --git a/crypto/mock_apple_keychain_mac.cc b/crypto/mock_apple_keychain_mac.cc
index 010f00c..c00c34f 100644
--- a/crypto/mock_apple_keychain_mac.cc
+++ b/crypto/mock_apple_keychain_mac.cc
@@ -4,7 +4,6 @@
 
 #include <stddef.h>
 
-#include "base/logging.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "crypto/mock_apple_keychain.h"
diff --git a/crypto/p224_spake_unittest.cc b/crypto/p224_spake_unittest.cc
index 5ecb6fd..e1220c4 100644
--- a/crypto/p224_spake_unittest.cc
+++ b/crypto/p224_spake_unittest.cc
@@ -9,7 +9,6 @@
 
 #include <string>
 
-#include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/crypto/rsa_private_key.cc b/crypto/rsa_private_key.cc
index ab8027c..2f485311 100644
--- a/crypto/rsa_private_key.cc
+++ b/crypto/rsa_private_key.cc
@@ -9,7 +9,7 @@
 #include <memory>
 #include <utility>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "crypto/openssl_util.h"
 #include "third_party/boringssl/src/include/openssl/bn.h"
 #include "third_party/boringssl/src/include/openssl/bytestring.h"
diff --git a/crypto/scoped_test_nss_chromeos_user.cc b/crypto/scoped_test_nss_chromeos_user.cc
index 49b92d48..2723007 100644
--- a/crypto/scoped_test_nss_chromeos_user.cc
+++ b/crypto/scoped_test_nss_chromeos_user.cc
@@ -4,7 +4,7 @@
 
 #include "crypto/scoped_test_nss_chromeos_user.h"
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "crypto/nss_util.h"
 #include "crypto/nss_util_internal.h"
 
diff --git a/crypto/secure_hash.cc b/crypto/secure_hash.cc
index ea5e44f1..e1cd2281 100644
--- a/crypto/secure_hash.cc
+++ b/crypto/secure_hash.cc
@@ -6,8 +6,8 @@
 
 #include <stddef.h>
 
-#include "base/logging.h"
 #include "base/memory/ptr_util.h"
+#include "base/notreached.h"
 #include "base/pickle.h"
 #include "crypto/openssl_util.h"
 #include "third_party/boringssl/src/include/openssl/mem.h"
diff --git a/crypto/signature_creator.cc b/crypto/signature_creator.cc
index c440fda..a074a9c 100644
--- a/crypto/signature_creator.cc
+++ b/crypto/signature_creator.cc
@@ -7,7 +7,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "crypto/openssl_util.h"
 #include "crypto/rsa_private_key.h"
 #include "third_party/boringssl/src/include/openssl/evp.h"
diff --git a/crypto/signature_verifier.cc b/crypto/signature_verifier.cc
index fd29bdf..7d48438 100644
--- a/crypto/signature_verifier.cc
+++ b/crypto/signature_verifier.cc
@@ -4,7 +4,7 @@
 
 #include "crypto/signature_verifier.h"
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "crypto/openssl_util.h"
 #include "third_party/boringssl/src/include/openssl/bytestring.h"
 #include "third_party/boringssl/src/include/openssl/digest.h"
diff --git a/crypto/signature_verifier_unittest.cc b/crypto/signature_verifier_unittest.cc
index a3077ef3..300fd2d 100644
--- a/crypto/signature_verifier_unittest.cc
+++ b/crypto/signature_verifier_unittest.cc
@@ -7,7 +7,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "base/logging.h"
 #include "base/macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/crypto/symmetric_key.cc b/crypto/symmetric_key.cc
index b239d22c..63e070df 100644
--- a/crypto/symmetric_key.cc
+++ b/crypto/symmetric_key.cc
@@ -10,7 +10,8 @@
 #include <algorithm>
 #include <utility>
 
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/notreached.h"
 #include "base/strings/string_util.h"
 #include "crypto/openssl_util.h"
 #include "third_party/boringssl/src/include/openssl/evp.h"