From 32f2a30e5e149358d7ddd1ae9818fff339e5f9f5 Mon Sep 17 00:00:00 2001
From: Tommi <tommi@webrtc.org>
Date: Thu, 8 Feb 2024 19:16:49 +0100
Subject: [PATCH] Move IceCandidateType to candidate.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: none
Change-Id: I3152d36c379ef0b2c8928a0e5750e012157fd26c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/336920
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41711}
---
 api/candidate.h                                          | 4 ++++
 logging/BUILD.gn                                         | 1 +
 .../events/rtc_event_ice_candidate_pair_config.h         | 9 +--------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/api/candidate.h b/api/candidate.h
index d48f4fc559..3fefd1114b 100644
--- a/api/candidate.h
+++ b/api/candidate.h
@@ -24,6 +24,10 @@
 #include "rtc_base/socket_address.h"
 #include "rtc_base/system/rtc_export.h"
 
+namespace webrtc {
+enum class IceCandidateType : int { kHost, kSrflx, kPrflx, kRelay };
+}  // namespace webrtc
+
 namespace cricket {
 
 // TODO(tommi): These are temporarily here, moved from `port.h` and will
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index 415c52789c..117d5c4a3c 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -688,6 +688,7 @@ rtc_library("ice_log") {
 
   deps = [
     ":rtc_event_field",
+    "../api:candidate",
     "../api:dtls_transport_interface",
     "../api:libjingle_logging_api",
     "../api/rtc_event_log",
diff --git a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h
index 14984b324f..8198659cb2 100644
--- a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h
+++ b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h
@@ -18,6 +18,7 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
+#include "api/candidate.h"
 #include "api/rtc_event_log/rtc_event.h"
 #include "api/units/timestamp.h"
 #include "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h"
@@ -32,14 +33,6 @@ enum class IceCandidatePairConfigType {
   kNumValues,
 };
 
-// TODO(tommi): Move this definition to candidate.h.
-enum class IceCandidateType {
-  kHost,
-  kSrflx,
-  kPrflx,
-  kRelay,
-};
-
 enum class IceCandidatePairProtocol {
   kUnknown,
   kUdp,