From ee303fae486faab44c1d3778e2d877bf3595ae0f Mon Sep 17 00:00:00 2001
From: Anton Sukhanov <sukhanov@webrtc.org>
Date: Wed, 10 Jul 2019 11:07:40 -0700
Subject: [PATCH] Move datagram_dtls_adaptor from p2p/base/ to pc/

Datagram_dtls_adaptor needs access to rtp_rtcp modules and this moves helps to keep p2p/base/ without dependency on rtp_rtcp.

Bug: webrtc:9719
Change-Id: Ic337be3fb9f68106187a84efa815eefbe5b0fcd7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/145267
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Anton Sukhanov <sukhanov@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28533}
---
 p2p/BUILD.gn                              | 2 --
 pc/BUILD.gn                               | 3 +++
 {p2p/base => pc}/datagram_dtls_adaptor.cc | 2 +-
 {p2p/base => pc}/datagram_dtls_adaptor.h  | 6 +++---
 pc/jsep_transport_controller.cc           | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)
 rename {p2p/base => pc}/datagram_dtls_adaptor.cc (99%)
 rename {p2p/base => pc}/datagram_dtls_adaptor.h (97%)

diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index a07afefc79..243cf4f22a 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -29,8 +29,6 @@ rtc_static_library("rtc_p2p") {
     "base/connection.h",
     "base/connection_info.cc",
     "base/connection_info.h",
-    "base/datagram_dtls_adaptor.cc",
-    "base/datagram_dtls_adaptor.h",
     "base/dtls_transport.cc",
     "base/dtls_transport.h",
     "base/dtls_transport_internal.cc",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 714e7eb704..7ecc259bbe 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -36,6 +36,8 @@ rtc_static_library("rtc_pc_base") {
     "channel_manager.h",
     "composite_rtp_transport.cc",
     "composite_rtp_transport.h",
+    "datagram_dtls_adaptor.cc",
+    "datagram_dtls_adaptor.h",
     "dtls_srtp_transport.cc",
     "dtls_srtp_transport.h",
     "dtls_transport.cc",
@@ -89,6 +91,7 @@ rtc_static_library("rtc_pc_base") {
     "../call:rtp_interfaces",
     "../call:rtp_receiver",
     "../common_video",
+    "../logging:ice_log",
     "../logging:rtc_event_log_api",
     "../media:rtc_data",
     "../media:rtc_h264_profile_id",
diff --git a/p2p/base/datagram_dtls_adaptor.cc b/pc/datagram_dtls_adaptor.cc
similarity index 99%
rename from p2p/base/datagram_dtls_adaptor.cc
rename to pc/datagram_dtls_adaptor.cc
index add07a1656..302a7425ce 100644
--- a/p2p/base/datagram_dtls_adaptor.cc
+++ b/pc/datagram_dtls_adaptor.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/datagram_dtls_adaptor.h"
+#include "pc/datagram_dtls_adaptor.h"
 
 #include <algorithm>
 #include <memory>
diff --git a/p2p/base/datagram_dtls_adaptor.h b/pc/datagram_dtls_adaptor.h
similarity index 97%
rename from p2p/base/datagram_dtls_adaptor.h
rename to pc/datagram_dtls_adaptor.h
index c68589060f..e027c7635b 100644
--- a/p2p/base/datagram_dtls_adaptor.h
+++ b/pc/datagram_dtls_adaptor.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_DATAGRAM_DTLS_ADAPTOR_H_
-#define P2P_BASE_DATAGRAM_DTLS_ADAPTOR_H_
+#ifndef PC_DATAGRAM_DTLS_ADAPTOR_H_
+#define PC_DATAGRAM_DTLS_ADAPTOR_H_
 
 #include <memory>
 #include <string>
@@ -149,4 +149,4 @@ class DatagramDtlsAdaptor : public DtlsTransportInternal,
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_DATAGRAM_DTLS_ADAPTOR_H_
+#endif  // PC_DATAGRAM_DTLS_ADAPTOR_H_
diff --git a/pc/jsep_transport_controller.cc b/pc/jsep_transport_controller.cc
index e3ae2bac0c..02006082ea 100644
--- a/pc/jsep_transport_controller.cc
+++ b/pc/jsep_transport_controller.cc
@@ -17,10 +17,10 @@
 #include "absl/memory/memory.h"
 #include "api/datagram_transport_interface.h"
 #include "api/media_transport_interface.h"
-#include "p2p/base/datagram_dtls_adaptor.h"
 #include "p2p/base/ice_transport_internal.h"
 #include "p2p/base/no_op_dtls_transport.h"
 #include "p2p/base/port.h"
+#include "pc/datagram_dtls_adaptor.h"
 #include "pc/srtp_filter.h"
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"