From bfcec4c6d838cd09ef921bbb4ef780cc294f0c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 25 Sep 2019 10:00:34 +0200 Subject: [PATCH] Delete old placeholders for moved api/ header files The header files api/congestion_control_interface.h api/data_channel_transport_interface.h api/datagram_transport_interface.h api/media_transport_config.h api/media_transport_interface.h have been moved into the api/transport/ and api/transport/media subdirectories. Bug: webrtc:8733 Change-Id: I98752c4d1306b54559bafa71712b105932c08834 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153522 Reviewed-by: Karl Wiberg Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#29357} --- api/BUILD.gn | 5 ----- api/congestion_control_interface.h | 17 ----------------- api/data_channel_transport_interface.h | 17 ----------------- api/datagram_transport_interface.h | 17 ----------------- api/media_transport_config.h | 16 ---------------- api/media_transport_interface.h | 17 ----------------- pc/composite_data_channel_transport.h | 2 +- pc/sctp_data_channel_transport.h | 2 +- pc/sctp_utils.h | 2 +- 9 files changed, 3 insertions(+), 92 deletions(-) delete mode 100644 api/congestion_control_interface.h delete mode 100644 api/data_channel_transport_interface.h delete mode 100644 api/datagram_transport_interface.h delete mode 100644 api/media_transport_config.h delete mode 100644 api/media_transport_interface.h diff --git a/api/BUILD.gn b/api/BUILD.gn index 8366025197..27fb45eef9 100644 --- a/api/BUILD.gn +++ b/api/BUILD.gn @@ -123,12 +123,9 @@ rtc_static_library("libjingle_peerconnection_api") { sources = [ "candidate.cc", "candidate.h", - "congestion_control_interface.h", "crypto_params.h", "data_channel_interface.cc", "data_channel_interface.h", - "data_channel_transport_interface.h", - "datagram_transport_interface.h", "dtls_transport_interface.cc", "dtls_transport_interface.h", "dtmf_sender_interface.h", @@ -140,8 +137,6 @@ rtc_static_library("libjingle_peerconnection_api") { "jsep_session_description.h", "media_stream_proxy.h", "media_stream_track_proxy.h", - "media_transport_config.h", - "media_transport_interface.h", "peer_connection_factory_proxy.h", "peer_connection_interface.cc", "peer_connection_interface.h", diff --git a/api/congestion_control_interface.h b/api/congestion_control_interface.h deleted file mode 100644 index 3666022488..0000000000 --- a/api/congestion_control_interface.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef API_CONGESTION_CONTROL_INTERFACE_H_ -#define API_CONGESTION_CONTROL_INTERFACE_H_ - -// TODO(bugs.webrtc.org/8733): Delete once users are updated for the new -// location. -#include "api/transport/congestion_control_interface.h" - -#endif // API_CONGESTION_CONTROL_INTERFACE_H_ diff --git a/api/data_channel_transport_interface.h b/api/data_channel_transport_interface.h deleted file mode 100644 index dcb693c6bf..0000000000 --- a/api/data_channel_transport_interface.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef API_DATA_CHANNEL_TRANSPORT_INTERFACE_H_ -#define API_DATA_CHANNEL_TRANSPORT_INTERFACE_H_ - -// TODO(bugs.webrtc.org/8733): Delete once users are updated for the new -// location. -#include "api/transport/data_channel_transport_interface.h" - -#endif // API_DATA_CHANNEL_TRANSPORT_INTERFACE_H_ diff --git a/api/datagram_transport_interface.h b/api/datagram_transport_interface.h deleted file mode 100644 index f36f5b3a6e..0000000000 --- a/api/datagram_transport_interface.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef API_DATAGRAM_TRANSPORT_INTERFACE_H_ -#define API_DATAGRAM_TRANSPORT_INTERFACE_H_ - -// TODO(bugs.webrtc.org/8733): Delete once users are updated for the new -// location. -#include "api/transport/datagram_transport_interface.h" - -#endif // API_DATAGRAM_TRANSPORT_INTERFACE_H_ diff --git a/api/media_transport_config.h b/api/media_transport_config.h deleted file mode 100644 index c74f38dc05..0000000000 --- a/api/media_transport_config.h +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ -#ifndef API_MEDIA_TRANSPORT_CONFIG_H_ -#define API_MEDIA_TRANSPORT_CONFIG_H_ - -// TODO(bugs.webrtc.org/8733): Delete once users are updated for the new -// location. -#include "api/transport/media/media_transport_config.h" - -#endif // API_MEDIA_TRANSPORT_CONFIG_H_ diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h deleted file mode 100644 index 867871bde7..0000000000 --- a/api/media_transport_interface.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef API_MEDIA_TRANSPORT_INTERFACE_H_ -#define API_MEDIA_TRANSPORT_INTERFACE_H_ - -// TODO(bugs.webrtc.org/8733): Delete once users are updated for the new -// location. -#include "api/transport/media/media_transport_interface.h" - -#endif // API_MEDIA_TRANSPORT_INTERFACE_H_ diff --git a/pc/composite_data_channel_transport.h b/pc/composite_data_channel_transport.h index b2a40fdb7a..97633cb6ed 100644 --- a/pc/composite_data_channel_transport.h +++ b/pc/composite_data_channel_transport.h @@ -13,7 +13,7 @@ #include -#include "api/data_channel_transport_interface.h" +#include "api/transport/data_channel_transport_interface.h" #include "rtc_base/critical_section.h" namespace webrtc { diff --git a/pc/sctp_data_channel_transport.h b/pc/sctp_data_channel_transport.h index 2d54be9de8..281c30edf4 100644 --- a/pc/sctp_data_channel_transport.h +++ b/pc/sctp_data_channel_transport.h @@ -11,7 +11,7 @@ #ifndef PC_SCTP_DATA_CHANNEL_TRANSPORT_H_ #define PC_SCTP_DATA_CHANNEL_TRANSPORT_H_ -#include "api/data_channel_transport_interface.h" +#include "api/transport/data_channel_transport_interface.h" #include "media/sctp/sctp_transport_internal.h" #include "rtc_base/third_party/sigslot/sigslot.h" diff --git a/pc/sctp_utils.h b/pc/sctp_utils.h index 6d41eb298c..339ef21163 100644 --- a/pc/sctp_utils.h +++ b/pc/sctp_utils.h @@ -14,7 +14,7 @@ #include #include "api/data_channel_interface.h" -#include "api/data_channel_transport_interface.h" +#include "api/transport/data_channel_transport_interface.h" #include "media/base/media_channel.h" namespace rtc {