Apply include-cleaner to the SSL files
Bug: webrtc:42226242
Change-Id: I04acc5aa4c76af4e900d7a7b50129cee9c9c3137
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358180
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42723}
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 486e7f4..70a1adf 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -1634,6 +1634,7 @@
":threading",
":timeutils",
"../api:array_view",
+ "../api:sequence_checker",
"../api/task_queue:pending_task_safety_flag",
"../api/units:time_delta",
"../system_wrappers:field_trial",
@@ -2160,6 +2161,7 @@
"../api:array_view",
"../api:field_trials_view",
"../api:make_ref_counted",
+ "../api:sequence_checker",
"../api/task_queue",
"../api/task_queue:pending_task_safety_flag",
"../api/task_queue:task_queue_test",
@@ -2174,6 +2176,7 @@
"network:received_packet",
"synchronization:mutex",
"third_party/sigslot",
+ "//testing/gtest",
"//third_party/abseil-cpp/absl/algorithm:container",
"//third_party/abseil-cpp/absl/functional:any_invocable",
"//third_party/abseil-cpp/absl/memory",
diff --git a/rtc_base/DEPS b/rtc_base/DEPS
index bb985b9..17d6cf6 100644
--- a/rtc_base/DEPS
+++ b/rtc_base/DEPS
@@ -20,5 +20,11 @@
],
"trace_event\.h": [
"+third_party/perfetto",
- ]
+ ],
+ "openssl_adapter.cc": [
+ "+openssl",
+ ],
+ "openssl_stream_adapter.cc": [
+ "+openssl",
+ ],
}
diff --git a/rtc_base/openssl_adapter.cc b/rtc_base/openssl_adapter.cc
index b05d54f..03b9549 100644
--- a/rtc_base/openssl_adapter.cc
+++ b/rtc_base/openssl_adapter.cc
@@ -14,11 +14,27 @@
#include <openssl/bio.h>
#include <openssl/err.h>
+#include <cstdint>
+#include <string>
+#include <utility>
+#include <vector>
+
#include "absl/strings/string_view.h"
+#include "api/task_queue/pending_task_safety_flag.h"
+#include "openssl/base.h"
+#include "openssl/ssl.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/boringssl_certificate.h"
+#include "rtc_base/openssl_session_cache.h"
+#include "rtc_base/socket.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
#ifdef OPENSSL_IS_BORINGSSL
#include <openssl/pool.h>
#endif
-#include <openssl/rand.h>
#include <openssl/x509.h>
#include <string.h>
#include <time.h>
@@ -37,7 +53,6 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/openssl.h"
#ifdef OPENSSL_IS_BORINGSSL
#include "rtc_base/boringssl_identity.h"
#else
@@ -45,7 +60,6 @@
#endif
#include "rtc_base/openssl_utility.h"
#include "rtc_base/strings/str_join.h"
-#include "rtc_base/strings/string_builder.h"
#include "rtc_base/thread.h"
#include "system_wrappers/include/field_trial.h"
diff --git a/rtc_base/openssl_adapter_unittest.cc b/rtc_base/openssl_adapter_unittest.cc
index 3a4877b..2dfe34b 100644
--- a/rtc_base/openssl_adapter_unittest.cc
+++ b/rtc_base/openssl_adapter_unittest.cc
@@ -10,14 +10,19 @@
#include "rtc_base/openssl_adapter.h"
+#include <cstddef>
+#include <cstdint>
+#include <memory>
#include <sstream>
#include <string>
#include <vector>
-#include "absl/memory/memory.h"
-#include "rtc_base/gunit.h"
#include "rtc_base/socket.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/thread.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace rtc {
namespace {
diff --git a/rtc_base/openssl_stream_adapter.cc b/rtc_base/openssl_stream_adapter.cc
index 2907fb1..23f8de8 100644
--- a/rtc_base/openssl_stream_adapter.cc
+++ b/rtc_base/openssl_stream_adapter.cc
@@ -11,25 +11,37 @@
#include "rtc_base/openssl_stream_adapter.h"
#include <openssl/bio.h>
-#include <openssl/crypto.h>
#include <openssl/err.h>
-#include <openssl/rand.h>
#include <openssl/tls1.h>
-#include <openssl/x509v3.h>
-#include <atomic>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
#include <memory>
+#include <string>
#include <utility>
#include <vector>
+#include "absl/functional/any_invocable.h"
#include "absl/strings/string_view.h"
#include "api/array_view.h"
+#include "api/sequence_checker.h"
+#include "api/task_queue/pending_task_safety_flag.h"
+#include "api/units/time_delta.h"
+#include "openssl/base.h"
+#include "openssl/digest.h"
+#include "openssl/pool.h"
+#include "openssl/stack.h"
+#include "rtc_base/boringssl_certificate.h"
+#include "rtc_base/buffer.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/openssl.h"
#include "rtc_base/openssl_adapter.h"
#include "rtc_base/openssl_digest.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
+#include "rtc_base/task_utils/repeating_task.h"
#ifdef OPENSSL_IS_BORINGSSL
#include <openssl/dtls1.h>
#include <openssl/ssl.h>
diff --git a/rtc_base/ssl_adapter.cc b/rtc_base/ssl_adapter.cc
index ff936a7..126c83d 100644
--- a/rtc_base/ssl_adapter.cc
+++ b/rtc_base/ssl_adapter.cc
@@ -10,7 +10,10 @@
#include "rtc_base/ssl_adapter.h"
+#include <memory>
+
#include "rtc_base/openssl_adapter.h"
+#include "rtc_base/socket.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/rtc_base/ssl_adapter_unittest.cc b/rtc_base/ssl_adapter_unittest.cc
index 259b334..211042d 100644
--- a/rtc_base/ssl_adapter_unittest.cc
+++ b/rtc_base/ssl_adapter_unittest.cc
@@ -10,20 +10,32 @@
#include "rtc_base/ssl_adapter.h"
+#include <cstddef>
+#include <cstdint>
#include <memory>
#include <string>
#include <utility>
+#include <vector>
-#include "absl/memory/memory.h"
#include "absl/strings/string_view.h"
+#include "api/array_view.h"
+#include "api/sequence_checker.h"
+#include "rtc_base/checks.h"
#include "rtc_base/gunit.h"
#include "rtc_base/ip_address.h"
+#include "rtc_base/logging.h"
#include "rtc_base/message_digest.h"
+#include "rtc_base/socket.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_certificate.h"
#include "rtc_base/ssl_identity.h"
#include "rtc_base/stream.h"
#include "rtc_base/string_encode.h"
+#include "rtc_base/third_party/sigslot/sigslot.h"
+#include "rtc_base/thread.h"
#include "rtc_base/virtual_socket_server.h"
#include "test/gmock.h"
+#include "test/gtest.h"
using ::testing::_;
using ::testing::Return;
diff --git a/rtc_base/ssl_stream_adapter.cc b/rtc_base/ssl_stream_adapter.cc
index b5fd4e8..5023363 100644
--- a/rtc_base/ssl_stream_adapter.cc
+++ b/rtc_base/ssl_stream_adapter.cc
@@ -10,9 +10,18 @@
#include "rtc_base/ssl_stream_adapter.h"
-#include "absl/memory/memory.h"
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "absl/functional/any_invocable.h"
#include "absl/strings/string_view.h"
#include "rtc_base/openssl_stream_adapter.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/stream.h"
namespace rtc {
diff --git a/rtc_base/ssl_stream_adapter_unittest.cc b/rtc_base/ssl_stream_adapter_unittest.cc
index 42d1fba..588b8b1 100644
--- a/rtc_base/ssl_stream_adapter_unittest.cc
+++ b/rtc_base/ssl_stream_adapter_unittest.cc
@@ -10,27 +10,38 @@
#include "rtc_base/ssl_stream_adapter.h"
-#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <ctime>
#include <memory>
#include <set>
#include <string>
+#include <utility>
+#include <vector>
#include "absl/memory/memory.h"
#include "absl/strings/string_view.h"
#include "api/array_view.h"
+#include "api/sequence_checker.h"
#include "api/task_queue/pending_task_safety_flag.h"
+#include "api/units/time_delta.h"
#include "rtc_base/buffer_queue.h"
#include "rtc_base/callback_list.h"
#include "rtc_base/checks.h"
#include "rtc_base/crypto_random.h"
+#include "rtc_base/fake_clock.h"
#include "rtc_base/gunit.h"
+#include "rtc_base/logging.h"
#include "rtc_base/memory/fifo_buffer.h"
#include "rtc_base/memory_stream.h"
#include "rtc_base/message_digest.h"
#include "rtc_base/openssl_stream_adapter.h"
-#include "rtc_base/ssl_adapter.h"
#include "rtc_base/ssl_identity.h"
#include "rtc_base/stream.h"
+#include "rtc_base/third_party/sigslot/sigslot.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/time_utils.h"
#include "test/field_trial.h"
#include "test/gmock.h"
#include "test/gtest.h"
