(7) Rename files to snake_case: remove forwarding headers
Bug: webrtc:10159
Change-Id: I2ba899e0283b953538c7941c8790213e36d7c70e
Reviewed-on: https://webrtc-review.googlesource.com/c/118561
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26417}diff --git a/api/BUILD.gn b/api/BUILD.gn
index 4e2077a..7b8ae83 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -32,7 +32,6 @@
visibility = [ "*" ]
sources = [
"call/call_factory_interface.h",
- "call/callfactoryinterface.h",
]
}
@@ -69,33 +68,23 @@
cflags = []
sources = [
"async_resolver_factory.h",
- "asyncresolverfactory.h",
"bitrate_constraints.h",
"candidate.cc",
"candidate.h",
"crypto/crypto_options.cc",
"crypto/crypto_options.h",
- "crypto/cryptooptions.h",
"crypto/frame_decryptor_interface.h",
"crypto/frame_encryptor_interface.h",
- "crypto/framedecryptorinterface.h",
- "crypto/frameencryptorinterface.h",
"crypto_params.h",
- "cryptoparams.h",
"data_channel_interface.cc",
"data_channel_interface.h",
- "datachannelinterface.h",
"dtls_transport_interface.h",
- "dtlstransportinterface.h",
"dtmf_sender_interface.h",
- "dtmfsenderinterface.h",
"jsep.cc",
"jsep.h",
"jsep_ice_candidate.cc",
"jsep_ice_candidate.h",
"jsep_session_description.h",
- "jsepicecandidate.h",
- "jsepsessiondescription.h",
"media_constraints_interface.cc",
"media_constraints_interface.h",
"media_stream_interface.cc",
@@ -106,24 +95,15 @@
"media_transport_interface.h",
"media_types.cc",
"media_types.h",
- "mediaconstraintsinterface.h",
- "mediastreaminterface.h",
- "mediastreamproxy.h",
- "mediastreamtrackproxy.h",
- "mediatypes.h",
"notifier.h",
"peer_connection_factory_proxy.h",
"peer_connection_interface.cc",
"peer_connection_interface.h",
"peer_connection_proxy.h",
- "peerconnectionfactoryproxy.h",
- "peerconnectioninterface.h",
- "peerconnectionproxy.h",
"proxy.cc",
"proxy.h",
"rtc_error.cc",
"rtc_error.h",
- "rtcerror.h",
"rtp_headers.cc",
"rtp_headers.h",
"rtp_parameters.cc",
@@ -134,21 +114,12 @@
"rtp_sender_interface.h",
"rtp_transceiver_interface.cc",
"rtp_transceiver_interface.h",
- "rtpparameters.h",
- "rtpreceiverinterface.h",
- "rtpsenderinterface.h",
- "rtptransceiverinterface.h",
"set_remote_description_observer_interface.h",
- "setremotedescriptionobserverinterface.h",
"stats_types.cc",
"stats_types.h",
- "statstypes.h",
"turn_customizer.h",
- "turncustomizer.h",
"uma_metrics.h",
- "umametrics.h",
"video_track_source_proxy.h",
- "videosourceproxy.h",
]
deps = [
":array_view",
@@ -261,7 +232,6 @@
visibility = [ "*" ]
sources = [
"rtc_event_log_output.h",
- "rtceventlogoutput.h",
]
}
@@ -269,11 +239,8 @@
visibility = [ "*" ]
sources = [
"ortc/packet_transport_interface.h",
- "ortc/packettransportinterface.h",
"ortc/rtp_transport_interface.h",
- "ortc/rtptransportinterface.h",
"ortc/srtp_transport_interface.h",
- "ortc/srtptransportinterface.h",
]
deps = [
@@ -289,10 +256,7 @@
"stats/rtc_stats.h",
"stats/rtc_stats_collector_callback.h",
"stats/rtc_stats_report.h",
- "stats/rtcstats.h",
"stats/rtcstats_objects.h",
- "stats/rtcstatscollectorcallback.h",
- "stats/rtcstatsreport.h",
]
deps = [
@@ -375,7 +339,6 @@
visibility = [ "*" ]
sources = [
"ref_counted_base.h",
- "refcountedbase.h",
]
deps = [
"../rtc_base:rtc_base_approved",
@@ -387,7 +350,6 @@
testonly = true
sources = [
"test/fake_constraints.h",
- "test/fakeconstraints.h",
]
deps = [
diff --git a/api/asyncresolverfactory.h b/api/asyncresolverfactory.h
deleted file mode 100644
index 6034af2..0000000
--- a/api/asyncresolverfactory.h
+++ /dev/null
@@ -1,19 +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_ASYNCRESOLVERFACTORY_H_
-#define API_ASYNCRESOLVERFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/async_resolver_factory.h"
-
-#endif // API_ASYNCRESOLVERFACTORY_H_
diff --git a/api/call/callfactoryinterface.h b/api/call/callfactoryinterface.h
deleted file mode 100644
index 073cf70..0000000
--- a/api/call/callfactoryinterface.h
+++ /dev/null
@@ -1,19 +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_CALL_CALLFACTORYINTERFACE_H_
-#define API_CALL_CALLFACTORYINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/call/call_factory_interface.h"
-
-#endif // API_CALL_CALLFACTORYINTERFACE_H_
diff --git a/api/crypto/cryptooptions.h b/api/crypto/cryptooptions.h
deleted file mode 100644
index c902155..0000000
--- a/api/crypto/cryptooptions.h
+++ /dev/null
@@ -1,19 +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_CRYPTO_CRYPTOOPTIONS_H_
-#define API_CRYPTO_CRYPTOOPTIONS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/crypto/crypto_options.h"
-
-#endif // API_CRYPTO_CRYPTOOPTIONS_H_
diff --git a/api/crypto/framedecryptorinterface.h b/api/crypto/framedecryptorinterface.h
deleted file mode 100644
index bd96606..0000000
--- a/api/crypto/framedecryptorinterface.h
+++ /dev/null
@@ -1,19 +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_CRYPTO_FRAMEDECRYPTORINTERFACE_H_
-#define API_CRYPTO_FRAMEDECRYPTORINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/crypto/frame_decryptor_interface.h"
-
-#endif // API_CRYPTO_FRAMEDECRYPTORINTERFACE_H_
diff --git a/api/crypto/frameencryptorinterface.h b/api/crypto/frameencryptorinterface.h
deleted file mode 100644
index d56493e..0000000
--- a/api/crypto/frameencryptorinterface.h
+++ /dev/null
@@ -1,19 +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_CRYPTO_FRAMEENCRYPTORINTERFACE_H_
-#define API_CRYPTO_FRAMEENCRYPTORINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/crypto/frame_encryptor_interface.h"
-
-#endif // API_CRYPTO_FRAMEENCRYPTORINTERFACE_H_
diff --git a/api/cryptoparams.h b/api/cryptoparams.h
deleted file mode 100644
index 679d7b8..0000000
--- a/api/cryptoparams.h
+++ /dev/null
@@ -1,19 +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_CRYPTOPARAMS_H_
-#define API_CRYPTOPARAMS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/crypto_params.h"
-
-#endif // API_CRYPTOPARAMS_H_
diff --git a/api/datachannelinterface.h b/api/datachannelinterface.h
deleted file mode 100644
index e8fb86a..0000000
--- a/api/datachannelinterface.h
+++ /dev/null
@@ -1,19 +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_DATACHANNELINTERFACE_H_
-#define API_DATACHANNELINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/data_channel_interface.h"
-
-#endif // API_DATACHANNELINTERFACE_H_
diff --git a/api/dtlstransportinterface.h b/api/dtlstransportinterface.h
deleted file mode 100644
index 15f1c72..0000000
--- a/api/dtlstransportinterface.h
+++ /dev/null
@@ -1,19 +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_DTLSTRANSPORTINTERFACE_H_
-#define API_DTLSTRANSPORTINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/dtls_transport_interface.h"
-
-#endif // API_DTLSTRANSPORTINTERFACE_H_
diff --git a/api/dtmfsenderinterface.h b/api/dtmfsenderinterface.h
deleted file mode 100644
index 71fa24c..0000000
--- a/api/dtmfsenderinterface.h
+++ /dev/null
@@ -1,19 +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_DTMFSENDERINTERFACE_H_
-#define API_DTMFSENDERINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/dtmf_sender_interface.h"
-
-#endif // API_DTMFSENDERINTERFACE_H_
diff --git a/api/jsepicecandidate.h b/api/jsepicecandidate.h
deleted file mode 100644
index 6219ea7..0000000
--- a/api/jsepicecandidate.h
+++ /dev/null
@@ -1,19 +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_JSEPICECANDIDATE_H_
-#define API_JSEPICECANDIDATE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/jsep_ice_candidate.h"
-
-#endif // API_JSEPICECANDIDATE_H_
diff --git a/api/jsepsessiondescription.h b/api/jsepsessiondescription.h
deleted file mode 100644
index 6cca44e..0000000
--- a/api/jsepsessiondescription.h
+++ /dev/null
@@ -1,19 +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_JSEPSESSIONDESCRIPTION_H_
-#define API_JSEPSESSIONDESCRIPTION_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/jsep_session_description.h"
-
-#endif // API_JSEPSESSIONDESCRIPTION_H_
diff --git a/api/mediaconstraintsinterface.h b/api/mediaconstraintsinterface.h
deleted file mode 100644
index 10dcb7b..0000000
--- a/api/mediaconstraintsinterface.h
+++ /dev/null
@@ -1,19 +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_MEDIACONSTRAINTSINTERFACE_H_
-#define API_MEDIACONSTRAINTSINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/media_constraints_interface.h"
-
-#endif // API_MEDIACONSTRAINTSINTERFACE_H_
diff --git a/api/mediastreaminterface.h b/api/mediastreaminterface.h
deleted file mode 100644
index c521aa3..0000000
--- a/api/mediastreaminterface.h
+++ /dev/null
@@ -1,19 +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_MEDIASTREAMINTERFACE_H_
-#define API_MEDIASTREAMINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/media_stream_interface.h"
-
-#endif // API_MEDIASTREAMINTERFACE_H_
diff --git a/api/mediastreamproxy.h b/api/mediastreamproxy.h
deleted file mode 100644
index 9a0a5a7..0000000
--- a/api/mediastreamproxy.h
+++ /dev/null
@@ -1,19 +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_MEDIASTREAMPROXY_H_
-#define API_MEDIASTREAMPROXY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/media_stream_proxy.h"
-
-#endif // API_MEDIASTREAMPROXY_H_
diff --git a/api/mediastreamtrackproxy.h b/api/mediastreamtrackproxy.h
deleted file mode 100644
index 823a580..0000000
--- a/api/mediastreamtrackproxy.h
+++ /dev/null
@@ -1,19 +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_MEDIASTREAMTRACKPROXY_H_
-#define API_MEDIASTREAMTRACKPROXY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/media_stream_track_proxy.h"
-
-#endif // API_MEDIASTREAMTRACKPROXY_H_
diff --git a/api/mediatypes.h b/api/mediatypes.h
deleted file mode 100644
index caf2a46..0000000
--- a/api/mediatypes.h
+++ /dev/null
@@ -1,19 +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_MEDIATYPES_H_
-#define API_MEDIATYPES_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/media_types.h"
-
-#endif // API_MEDIATYPES_H_
diff --git a/api/ortc/packettransportinterface.h b/api/ortc/packettransportinterface.h
deleted file mode 100644
index 665c3ab..0000000
--- a/api/ortc/packettransportinterface.h
+++ /dev/null
@@ -1,19 +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_ORTC_PACKETTRANSPORTINTERFACE_H_
-#define API_ORTC_PACKETTRANSPORTINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/ortc/packet_transport_interface.h"
-
-#endif // API_ORTC_PACKETTRANSPORTINTERFACE_H_
diff --git a/api/ortc/rtptransportinterface.h b/api/ortc/rtptransportinterface.h
deleted file mode 100644
index 1094557..0000000
--- a/api/ortc/rtptransportinterface.h
+++ /dev/null
@@ -1,19 +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_ORTC_RTPTRANSPORTINTERFACE_H_
-#define API_ORTC_RTPTRANSPORTINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/ortc/rtp_transport_interface.h"
-
-#endif // API_ORTC_RTPTRANSPORTINTERFACE_H_
diff --git a/api/ortc/srtptransportinterface.h b/api/ortc/srtptransportinterface.h
deleted file mode 100644
index 6e51789..0000000
--- a/api/ortc/srtptransportinterface.h
+++ /dev/null
@@ -1,19 +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_ORTC_SRTPTRANSPORTINTERFACE_H_
-#define API_ORTC_SRTPTRANSPORTINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/ortc/srtp_transport_interface.h"
-
-#endif // API_ORTC_SRTPTRANSPORTINTERFACE_H_
diff --git a/api/peerconnectionfactoryproxy.h b/api/peerconnectionfactoryproxy.h
deleted file mode 100644
index 1abede5..0000000
--- a/api/peerconnectionfactoryproxy.h
+++ /dev/null
@@ -1,19 +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_PEERCONNECTIONFACTORYPROXY_H_
-#define API_PEERCONNECTIONFACTORYPROXY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/peer_connection_factory_proxy.h"
-
-#endif // API_PEERCONNECTIONFACTORYPROXY_H_
diff --git a/api/peerconnectioninterface.h b/api/peerconnectioninterface.h
deleted file mode 100644
index 4378689..0000000
--- a/api/peerconnectioninterface.h
+++ /dev/null
@@ -1,19 +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_PEERCONNECTIONINTERFACE_H_
-#define API_PEERCONNECTIONINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/peer_connection_interface.h"
-
-#endif // API_PEERCONNECTIONINTERFACE_H_
diff --git a/api/peerconnectionproxy.h b/api/peerconnectionproxy.h
deleted file mode 100644
index 2594bdc..0000000
--- a/api/peerconnectionproxy.h
+++ /dev/null
@@ -1,19 +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_PEERCONNECTIONPROXY_H_
-#define API_PEERCONNECTIONPROXY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/peer_connection_proxy.h"
-
-#endif // API_PEERCONNECTIONPROXY_H_
diff --git a/api/refcountedbase.h b/api/refcountedbase.h
deleted file mode 100644
index 7421a6e..0000000
--- a/api/refcountedbase.h
+++ /dev/null
@@ -1,19 +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_REFCOUNTEDBASE_H_
-#define API_REFCOUNTEDBASE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/ref_counted_base.h"
-
-#endif // API_REFCOUNTEDBASE_H_
diff --git a/api/rtcerror.h b/api/rtcerror.h
deleted file mode 100644
index 93ec5ac..0000000
--- a/api/rtcerror.h
+++ /dev/null
@@ -1,19 +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_RTCERROR_H_
-#define API_RTCERROR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/rtc_error.h"
-
-#endif // API_RTCERROR_H_
diff --git a/api/rtceventlogoutput.h b/api/rtceventlogoutput.h
deleted file mode 100644
index b22d3a0..0000000
--- a/api/rtceventlogoutput.h
+++ /dev/null
@@ -1,19 +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_RTCEVENTLOGOUTPUT_H_
-#define API_RTCEVENTLOGOUTPUT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/rtc_event_log_output.h"
-
-#endif // API_RTCEVENTLOGOUTPUT_H_
diff --git a/api/rtpparameters.h b/api/rtpparameters.h
deleted file mode 100644
index 267e353..0000000
--- a/api/rtpparameters.h
+++ /dev/null
@@ -1,19 +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_RTPPARAMETERS_H_
-#define API_RTPPARAMETERS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/rtp_parameters.h"
-
-#endif // API_RTPPARAMETERS_H_
diff --git a/api/rtpreceiverinterface.h b/api/rtpreceiverinterface.h
deleted file mode 100644
index ded283e..0000000
--- a/api/rtpreceiverinterface.h
+++ /dev/null
@@ -1,19 +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_RTPRECEIVERINTERFACE_H_
-#define API_RTPRECEIVERINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/rtp_receiver_interface.h"
-
-#endif // API_RTPRECEIVERINTERFACE_H_
diff --git a/api/rtpsenderinterface.h b/api/rtpsenderinterface.h
deleted file mode 100644
index 1af3662..0000000
--- a/api/rtpsenderinterface.h
+++ /dev/null
@@ -1,19 +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_RTPSENDERINTERFACE_H_
-#define API_RTPSENDERINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/rtp_sender_interface.h"
-
-#endif // API_RTPSENDERINTERFACE_H_
diff --git a/api/rtptransceiverinterface.h b/api/rtptransceiverinterface.h
deleted file mode 100644
index 8751583..0000000
--- a/api/rtptransceiverinterface.h
+++ /dev/null
@@ -1,19 +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_RTPTRANSCEIVERINTERFACE_H_
-#define API_RTPTRANSCEIVERINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/rtp_transceiver_interface.h"
-
-#endif // API_RTPTRANSCEIVERINTERFACE_H_
diff --git a/api/setremotedescriptionobserverinterface.h b/api/setremotedescriptionobserverinterface.h
deleted file mode 100644
index 8373a06..0000000
--- a/api/setremotedescriptionobserverinterface.h
+++ /dev/null
@@ -1,19 +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_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_
-#define API_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/set_remote_description_observer_interface.h"
-
-#endif // API_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_
diff --git a/api/stats/rtcstats.h b/api/stats/rtcstats.h
deleted file mode 100644
index 98578b6..0000000
--- a/api/stats/rtcstats.h
+++ /dev/null
@@ -1,19 +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_STATS_RTCSTATS_H_
-#define API_STATS_RTCSTATS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/stats/rtc_stats.h"
-
-#endif // API_STATS_RTCSTATS_H_
diff --git a/api/stats/rtcstatscollectorcallback.h b/api/stats/rtcstatscollectorcallback.h
deleted file mode 100644
index 19db98a..0000000
--- a/api/stats/rtcstatscollectorcallback.h
+++ /dev/null
@@ -1,19 +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_STATS_RTCSTATSCOLLECTORCALLBACK_H_
-#define API_STATS_RTCSTATSCOLLECTORCALLBACK_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/stats/rtc_stats_collector_callback.h"
-
-#endif // API_STATS_RTCSTATSCOLLECTORCALLBACK_H_
diff --git a/api/stats/rtcstatsreport.h b/api/stats/rtcstatsreport.h
deleted file mode 100644
index 44afc22..0000000
--- a/api/stats/rtcstatsreport.h
+++ /dev/null
@@ -1,19 +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_STATS_RTCSTATSREPORT_H_
-#define API_STATS_RTCSTATSREPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/stats/rtc_stats_report.h"
-
-#endif // API_STATS_RTCSTATSREPORT_H_
diff --git a/api/statstypes.h b/api/statstypes.h
deleted file mode 100644
index 54f5a2f..0000000
--- a/api/statstypes.h
+++ /dev/null
@@ -1,19 +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_STATSTYPES_H_
-#define API_STATSTYPES_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/stats_types.h"
-
-#endif // API_STATSTYPES_H_
diff --git a/api/task_queue/task_queue_test.cc b/api/task_queue/task_queue_test.cc
index cf9c814..103581a 100644
--- a/api/task_queue/task_queue_test.cc
+++ b/api/task_queue/task_queue_test.cc
@@ -13,7 +13,7 @@
#include "absl/strings/string_view.h"
#include "rtc_base/event.h"
#include "rtc_base/task_queue.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace webrtc {
namespace {
diff --git a/api/test/fakeconstraints.h b/api/test/fakeconstraints.h
deleted file mode 100644
index d479ac2..0000000
--- a/api/test/fakeconstraints.h
+++ /dev/null
@@ -1,19 +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_TEST_FAKECONSTRAINTS_H_
-#define API_TEST_FAKECONSTRAINTS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/test/fake_constraints.h"
-
-#endif // API_TEST_FAKECONSTRAINTS_H_
diff --git a/api/turncustomizer.h b/api/turncustomizer.h
deleted file mode 100644
index 28ff584..0000000
--- a/api/turncustomizer.h
+++ /dev/null
@@ -1,19 +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_TURNCUSTOMIZER_H_
-#define API_TURNCUSTOMIZER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/turn_customizer.h"
-
-#endif // API_TURNCUSTOMIZER_H_
diff --git a/api/umametrics.h b/api/umametrics.h
deleted file mode 100644
index 026e024..0000000
--- a/api/umametrics.h
+++ /dev/null
@@ -1,19 +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_UMAMETRICS_H_
-#define API_UMAMETRICS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/uma_metrics.h"
-
-#endif // API_UMAMETRICS_H_
diff --git a/api/videosourceproxy.h b/api/videosourceproxy.h
deleted file mode 100644
index d83ccca..0000000
--- a/api/videosourceproxy.h
+++ /dev/null
@@ -1,19 +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_VIDEOSOURCEPROXY_H_
-#define API_VIDEOSOURCEPROXY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "api/video_track_source_proxy.h"
-
-#endif // API_VIDEOSOURCEPROXY_H_
diff --git a/call/BUILD.gn b/call/BUILD.gn
index af7f446..8d65aa2 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -195,7 +195,6 @@
"call.cc",
"call_factory.cc",
"call_factory.h",
- "callfactory.h",
"degraded_call.cc",
"degraded_call.h",
"flexfec_receive_stream_impl.cc",
diff --git a/call/callfactory.h b/call/callfactory.h
deleted file mode 100644
index e82d457..0000000
--- a/call/callfactory.h
+++ /dev/null
@@ -1,19 +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 CALL_CALLFACTORY_H_
-#define CALL_CALLFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "call/call_factory.h"
-
-#endif // CALL_CALLFACTORY_H_
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index f5577b6..bc27983 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -494,7 +494,6 @@
"objcnativeapi/objc/NADViewController.mm",
"objcnativeapi/objc/objc_call_client.h",
"objcnativeapi/objc/objc_call_client.mm",
- "objcnativeapi/objc/objccallclient.h",
]
if (!build_with_chromium && is_clang) {
@@ -710,7 +709,6 @@
if (is_win) {
sources += [
"peerconnection/client/flag_defs.h",
- "peerconnection/client/flagdefs.h",
"peerconnection/client/main.cc",
"peerconnection/client/main_wnd.cc",
"peerconnection/client/main_wnd.h",
@@ -848,7 +846,6 @@
sources += [
"unityplugin/class_reference_holder.cc",
"unityplugin/class_reference_holder.h",
- "unityplugin/classreferenceholder.h",
"unityplugin/jni_onload.cc",
]
suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn
index 4c1abac..ccb9016 100644
--- a/examples/androidnativeapi/BUILD.gn
+++ b/examples/androidnativeapi/BUILD.gn
@@ -39,7 +39,6 @@
sources = [
"jni/android_call_client.cc",
"jni/android_call_client.h",
- "jni/androidcallclient.h",
"jni/onload.cc",
]
diff --git a/examples/androidnativeapi/jni/androidcallclient.h b/examples/androidnativeapi/jni/androidcallclient.h
deleted file mode 100644
index 795fb71..0000000
--- a/examples/androidnativeapi/jni/androidcallclient.h
+++ /dev/null
@@ -1,19 +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 EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_
-#define EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "examples/androidnativeapi/jni/android_call_client.h"
-
-#endif // EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_
diff --git a/examples/objcnativeapi/objc/objccallclient.h b/examples/objcnativeapi/objc/objccallclient.h
deleted file mode 100644
index f67fa3a..0000000
--- a/examples/objcnativeapi/objc/objccallclient.h
+++ /dev/null
@@ -1,19 +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 EXAMPLES_OBJCNATIVEAPI_OBJC_OBJCCALLCLIENT_H_
-#define EXAMPLES_OBJCNATIVEAPI_OBJC_OBJCCALLCLIENT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "examples/objcnativeapi/objc/objc_call_client.h"
-
-#endif // EXAMPLES_OBJCNATIVEAPI_OBJC_OBJCCALLCLIENT_H_
diff --git a/examples/peerconnection/client/flagdefs.h b/examples/peerconnection/client/flagdefs.h
deleted file mode 100644
index 4a80ad1..0000000
--- a/examples/peerconnection/client/flagdefs.h
+++ /dev/null
@@ -1,19 +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 EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
-#define EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "examples/peerconnection/client/flag_defs.h"
-
-#endif // EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
diff --git a/examples/unityplugin/classreferenceholder.h b/examples/unityplugin/classreferenceholder.h
deleted file mode 100644
index 069a27b..0000000
--- a/examples/unityplugin/classreferenceholder.h
+++ /dev/null
@@ -1,19 +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 EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
-#define EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "examples/unityplugin/class_reference_holder.h"
-
-#endif // EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index 0e2bd51..df3b9dd 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -166,7 +166,6 @@
"rtc_event_log/encoder/rtc_event_log_encoder_common.h",
"rtc_event_log/encoder/var_int.cc",
"rtc_event_log/encoder/var_int.h",
- "rtc_event_log/encoder/varint.h",
]
defines = []
@@ -420,7 +419,6 @@
"rtc_event_log/events/rtc_event_ice_candidate_pair_config.h",
"rtc_event_log/ice_logger.cc",
"rtc_event_log/ice_logger.h",
- "rtc_event_log/icelogger.h",
]
deps = [
diff --git a/logging/rtc_event_log/encoder/varint.h b/logging/rtc_event_log/encoder/varint.h
deleted file mode 100644
index 3eb7ea3..0000000
--- a/logging/rtc_event_log/encoder/varint.h
+++ /dev/null
@@ -1,19 +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 LOGGING_RTC_EVENT_LOG_ENCODER_VARINT_H_
-#define LOGGING_RTC_EVENT_LOG_ENCODER_VARINT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "logging/rtc_event_log/encoder/var_int.h"
-
-#endif // LOGGING_RTC_EVENT_LOG_ENCODER_VARINT_H_
diff --git a/logging/rtc_event_log/icelogger.h b/logging/rtc_event_log/icelogger.h
deleted file mode 100644
index 5ea01b0..0000000
--- a/logging/rtc_event_log/icelogger.h
+++ /dev/null
@@ -1,19 +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 LOGGING_RTC_EVENT_LOG_ICELOGGER_H_
-#define LOGGING_RTC_EVENT_LOG_ICELOGGER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "logging/rtc_event_log/ice_logger.h"
-
-#endif // LOGGING_RTC_EVENT_LOG_ICELOGGER_H_
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 4c4a9e1..8c05cc5 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -52,7 +52,6 @@
visibility = [ "*" ]
sources = [
"base/media_config.h",
- "base/mediaconfig.h",
]
}
@@ -89,9 +88,7 @@
sources = [
"base/adapted_video_track_source.cc",
"base/adapted_video_track_source.h",
- "base/adaptedvideotracksource.h",
"base/audio_source.h",
- "base/audiosource.h",
"base/codec.cc",
"base/codec.h",
"base/device.h",
@@ -101,24 +98,16 @@
"base/media_constants.h",
"base/media_engine.cc",
"base/media_engine.h",
- "base/mediachannel.h",
- "base/mediaconstants.h",
- "base/mediaengine.h",
"base/rid_description.cc",
"base/rid_description.h",
- "base/riddescription.h",
"base/rtp_data_engine.cc",
"base/rtp_data_engine.h",
"base/rtp_utils.cc",
"base/rtp_utils.h",
- "base/rtpdataengine.h",
- "base/rtputils.h",
"base/stream_params.cc",
"base/stream_params.h",
- "base/streamparams.h",
"base/turn_utils.cc",
"base/turn_utils.h",
- "base/turnutils.h",
"base/video_adapter.cc",
"base/video_adapter.h",
"base/video_broadcaster.cc",
@@ -129,11 +118,6 @@
"base/video_common.h",
"base/video_source_base.cc",
"base/video_source_base.h",
- "base/videoadapter.h",
- "base/videobroadcaster.h",
- "base/videocapturer.h",
- "base/videocommon.h",
- "base/videosourcebase.h",
]
if (!build_with_chromium && is_clang) {
@@ -256,11 +240,8 @@
"engine/internal_decoder_factory.h",
"engine/internal_encoder_factory.cc",
"engine/internal_encoder_factory.h",
- "engine/internaldecoderfactory.h",
- "engine/internalencoderfactory.h",
"engine/multiplex_codec_factory.cc",
"engine/multiplex_codec_factory.h",
- "engine/multiplexcodecfactory.h",
# TODO(bugs.webrtc.org/7925): stop exporting this header once downstream
# targets depend on :rtc_encoder_simulcast_proxy directly.
@@ -327,7 +308,6 @@
"engine/apm_helpers.cc",
"engine/apm_helpers.h",
"engine/null_webrtc_video_engine.h",
- "engine/nullwebrtcvideoengine.h",
"engine/payload_type_mapper.cc",
"engine/payload_type_mapper.h",
"engine/simulcast.cc",
@@ -338,9 +318,6 @@
"engine/webrtc_video_engine.h",
"engine/webrtc_voice_engine.cc",
"engine/webrtc_voice_engine.h",
- "engine/webrtcmediaengine.h",
- "engine/webrtcvideoengine.h",
- "engine/webrtcvoiceengine.h",
]
if (!build_with_chromium && is_clang) {
@@ -407,8 +384,6 @@
"sctp/sctp_transport.cc",
"sctp/sctp_transport.h",
"sctp/sctp_transport_internal.h",
- "sctp/sctptransport.h",
- "sctp/sctptransportinternal.h",
]
} else {
# libtool on mac does not like empty targets.
@@ -493,21 +468,12 @@
"base/fake_video_capturer.h",
"base/fake_video_renderer.cc",
"base/fake_video_renderer.h",
- "base/fakeframesource.h",
- "base/fakemediaengine.h",
- "base/fakenetworkinterface.h",
- "base/fakertp.h",
- "base/fakevideocapturer.h",
- "base/fakevideorenderer.h",
"base/test_utils.cc",
"base/test_utils.h",
- "base/testutils.h",
"engine/fake_webrtc_call.cc",
"engine/fake_webrtc_call.h",
"engine/fake_webrtc_video_engine.cc",
"engine/fake_webrtc_video_engine.h",
- "engine/fakewebrtccall.h",
- "engine/fakewebrtcvideoengine.h",
]
if (!build_with_chromium && is_clang) {
diff --git a/media/base/adaptedvideotracksource.h b/media/base/adaptedvideotracksource.h
deleted file mode 100644
index 810214c..0000000
--- a/media/base/adaptedvideotracksource.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_
-#define MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/adapted_video_track_source.h"
-
-#endif // MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_
diff --git a/media/base/audiosource.h b/media/base/audiosource.h
deleted file mode 100644
index abfc605..0000000
--- a/media/base/audiosource.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_AUDIOSOURCE_H_
-#define MEDIA_BASE_AUDIOSOURCE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/audio_source.h"
-
-#endif // MEDIA_BASE_AUDIOSOURCE_H_
diff --git a/media/base/fakeframesource.h b/media/base/fakeframesource.h
deleted file mode 100644
index b415d1e..0000000
--- a/media/base/fakeframesource.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_FAKEFRAMESOURCE_H_
-#define MEDIA_BASE_FAKEFRAMESOURCE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/fake_frame_source.h"
-
-#endif // MEDIA_BASE_FAKEFRAMESOURCE_H_
diff --git a/media/base/fakemediaengine.h b/media/base/fakemediaengine.h
deleted file mode 100644
index 59ee808..0000000
--- a/media/base/fakemediaengine.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_FAKEMEDIAENGINE_H_
-#define MEDIA_BASE_FAKEMEDIAENGINE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/fake_media_engine.h"
-
-#endif // MEDIA_BASE_FAKEMEDIAENGINE_H_
diff --git a/media/base/fakenetworkinterface.h b/media/base/fakenetworkinterface.h
deleted file mode 100644
index be64269..0000000
--- a/media/base/fakenetworkinterface.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_FAKENETWORKINTERFACE_H_
-#define MEDIA_BASE_FAKENETWORKINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/fake_network_interface.h"
-
-#endif // MEDIA_BASE_FAKENETWORKINTERFACE_H_
diff --git a/media/base/fakertp.h b/media/base/fakertp.h
deleted file mode 100644
index 368db9a..0000000
--- a/media/base/fakertp.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_FAKERTP_H_
-#define MEDIA_BASE_FAKERTP_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/fake_rtp.h"
-
-#endif // MEDIA_BASE_FAKERTP_H_
diff --git a/media/base/fakevideocapturer.h b/media/base/fakevideocapturer.h
deleted file mode 100644
index bfa1261..0000000
--- a/media/base/fakevideocapturer.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_FAKEVIDEOCAPTURER_H_
-#define MEDIA_BASE_FAKEVIDEOCAPTURER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/fake_video_capturer.h"
-
-#endif // MEDIA_BASE_FAKEVIDEOCAPTURER_H_
diff --git a/media/base/fakevideorenderer.h b/media/base/fakevideorenderer.h
deleted file mode 100644
index 81c59fa..0000000
--- a/media/base/fakevideorenderer.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_FAKEVIDEORENDERER_H_
-#define MEDIA_BASE_FAKEVIDEORENDERER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/fake_video_renderer.h"
-
-#endif // MEDIA_BASE_FAKEVIDEORENDERER_H_
diff --git a/media/base/mediachannel.h b/media/base/mediachannel.h
deleted file mode 100644
index 04e852f..0000000
--- a/media/base/mediachannel.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_MEDIACHANNEL_H_
-#define MEDIA_BASE_MEDIACHANNEL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/media_channel.h"
-
-#endif // MEDIA_BASE_MEDIACHANNEL_H_
diff --git a/media/base/mediaconfig.h b/media/base/mediaconfig.h
deleted file mode 100644
index a87c3fe..0000000
--- a/media/base/mediaconfig.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_MEDIACONFIG_H_
-#define MEDIA_BASE_MEDIACONFIG_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/media_config.h"
-
-#endif // MEDIA_BASE_MEDIACONFIG_H_
diff --git a/media/base/mediaconstants.h b/media/base/mediaconstants.h
deleted file mode 100644
index 65f06c5..0000000
--- a/media/base/mediaconstants.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_MEDIACONSTANTS_H_
-#define MEDIA_BASE_MEDIACONSTANTS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/media_constants.h"
-
-#endif // MEDIA_BASE_MEDIACONSTANTS_H_
diff --git a/media/base/mediaengine.h b/media/base/mediaengine.h
deleted file mode 100644
index 1fc1967..0000000
--- a/media/base/mediaengine.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_MEDIAENGINE_H_
-#define MEDIA_BASE_MEDIAENGINE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/media_engine.h"
-
-#endif // MEDIA_BASE_MEDIAENGINE_H_
diff --git a/media/base/riddescription.h b/media/base/riddescription.h
deleted file mode 100644
index adf12f6..0000000
--- a/media/base/riddescription.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_RIDDESCRIPTION_H_
-#define MEDIA_BASE_RIDDESCRIPTION_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/rid_description.h"
-
-#endif // MEDIA_BASE_RIDDESCRIPTION_H_
diff --git a/media/base/rtpdataengine.h b/media/base/rtpdataengine.h
deleted file mode 100644
index d13a361..0000000
--- a/media/base/rtpdataengine.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_RTPDATAENGINE_H_
-#define MEDIA_BASE_RTPDATAENGINE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/rtp_data_engine.h"
-
-#endif // MEDIA_BASE_RTPDATAENGINE_H_
diff --git a/media/base/rtputils.h b/media/base/rtputils.h
deleted file mode 100644
index b63b216..0000000
--- a/media/base/rtputils.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_RTPUTILS_H_
-#define MEDIA_BASE_RTPUTILS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/rtp_utils.h"
-
-#endif // MEDIA_BASE_RTPUTILS_H_
diff --git a/media/base/streamparams.h b/media/base/streamparams.h
deleted file mode 100644
index e58a774..0000000
--- a/media/base/streamparams.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_STREAMPARAMS_H_
-#define MEDIA_BASE_STREAMPARAMS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/stream_params.h"
-
-#endif // MEDIA_BASE_STREAMPARAMS_H_
diff --git a/media/base/testutils.h b/media/base/testutils.h
deleted file mode 100644
index 146afca..0000000
--- a/media/base/testutils.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_TESTUTILS_H_
-#define MEDIA_BASE_TESTUTILS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/test_utils.h"
-
-#endif // MEDIA_BASE_TESTUTILS_H_
diff --git a/media/base/turnutils.h b/media/base/turnutils.h
deleted file mode 100644
index eb2f15c..0000000
--- a/media/base/turnutils.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_TURNUTILS_H_
-#define MEDIA_BASE_TURNUTILS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/turn_utils.h"
-
-#endif // MEDIA_BASE_TURNUTILS_H_
diff --git a/media/base/videoadapter.h b/media/base/videoadapter.h
deleted file mode 100644
index dcc5668..0000000
--- a/media/base/videoadapter.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_VIDEOADAPTER_H_
-#define MEDIA_BASE_VIDEOADAPTER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/video_adapter.h"
-
-#endif // MEDIA_BASE_VIDEOADAPTER_H_
diff --git a/media/base/videobroadcaster.h b/media/base/videobroadcaster.h
deleted file mode 100644
index bd2a244..0000000
--- a/media/base/videobroadcaster.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_VIDEOBROADCASTER_H_
-#define MEDIA_BASE_VIDEOBROADCASTER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/video_broadcaster.h"
-
-#endif // MEDIA_BASE_VIDEOBROADCASTER_H_
diff --git a/media/base/videocapturer.h b/media/base/videocapturer.h
deleted file mode 100644
index 910171a..0000000
--- a/media/base/videocapturer.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_VIDEOCAPTURER_H_
-#define MEDIA_BASE_VIDEOCAPTURER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/video_capturer.h"
-
-#endif // MEDIA_BASE_VIDEOCAPTURER_H_
diff --git a/media/base/videocommon.h b/media/base/videocommon.h
deleted file mode 100644
index 1d82abb..0000000
--- a/media/base/videocommon.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_VIDEOCOMMON_H_
-#define MEDIA_BASE_VIDEOCOMMON_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/video_common.h"
-
-#endif // MEDIA_BASE_VIDEOCOMMON_H_
diff --git a/media/base/videosourcebase.h b/media/base/videosourcebase.h
deleted file mode 100644
index 0d58eb0..0000000
--- a/media/base/videosourcebase.h
+++ /dev/null
@@ -1,19 +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 MEDIA_BASE_VIDEOSOURCEBASE_H_
-#define MEDIA_BASE_VIDEOSOURCEBASE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/base/video_source_base.h"
-
-#endif // MEDIA_BASE_VIDEOSOURCEBASE_H_
diff --git a/media/engine/fakewebrtccall.h b/media/engine/fakewebrtccall.h
deleted file mode 100644
index ee55933..0000000
--- a/media/engine/fakewebrtccall.h
+++ /dev/null
@@ -1,19 +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 MEDIA_ENGINE_FAKEWEBRTCCALL_H_
-#define MEDIA_ENGINE_FAKEWEBRTCCALL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/engine/fake_webrtc_call.h"
-
-#endif // MEDIA_ENGINE_FAKEWEBRTCCALL_H_
diff --git a/media/engine/fakewebrtcvideoengine.h b/media/engine/fakewebrtcvideoengine.h
deleted file mode 100644
index c056afa..0000000
--- a/media/engine/fakewebrtcvideoengine.h
+++ /dev/null
@@ -1,19 +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 MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
-#define MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/engine/fake_webrtc_video_engine.h"
-
-#endif // MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
diff --git a/media/engine/internaldecoderfactory.h b/media/engine/internaldecoderfactory.h
deleted file mode 100644
index 5b6a7fc..0000000
--- a/media/engine/internaldecoderfactory.h
+++ /dev/null
@@ -1,19 +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 MEDIA_ENGINE_INTERNALDECODERFACTORY_H_
-#define MEDIA_ENGINE_INTERNALDECODERFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/engine/internal_decoder_factory.h"
-
-#endif // MEDIA_ENGINE_INTERNALDECODERFACTORY_H_
diff --git a/media/engine/internalencoderfactory.h b/media/engine/internalencoderfactory.h
deleted file mode 100644
index 2519ff3..0000000
--- a/media/engine/internalencoderfactory.h
+++ /dev/null
@@ -1,19 +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 MEDIA_ENGINE_INTERNALENCODERFACTORY_H_
-#define MEDIA_ENGINE_INTERNALENCODERFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/engine/internal_encoder_factory.h"
-
-#endif // MEDIA_ENGINE_INTERNALENCODERFACTORY_H_
diff --git a/media/engine/multiplexcodecfactory.h b/media/engine/multiplexcodecfactory.h
deleted file mode 100644
index b19baeb..0000000
--- a/media/engine/multiplexcodecfactory.h
+++ /dev/null
@@ -1,19 +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 MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_
-#define MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/engine/multiplex_codec_factory.h"
-
-#endif // MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_
diff --git a/media/engine/nullwebrtcvideoengine.h b/media/engine/nullwebrtcvideoengine.h
deleted file mode 100644
index 2581ca7..0000000
--- a/media/engine/nullwebrtcvideoengine.h
+++ /dev/null
@@ -1,19 +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 MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
-#define MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/engine/null_webrtc_video_engine.h"
-
-#endif // MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
diff --git a/media/engine/webrtc_video_engine_unittest.cc b/media/engine/webrtc_video_engine_unittest.cc
index ad5b54b..a4bb932 100644
--- a/media/engine/webrtc_video_engine_unittest.cc
+++ b/media/engine/webrtc_video_engine_unittest.cc
@@ -51,7 +51,7 @@
#include "rtc_base/fake_clock.h"
#include "rtc_base/gunit.h"
#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "test/field_trial.h"
#include "test/frame_generator.h"
#include "test/gmock.h"
diff --git a/media/engine/webrtcmediaengine.h b/media/engine/webrtcmediaengine.h
deleted file mode 100644
index 44b7703..0000000
--- a/media/engine/webrtcmediaengine.h
+++ /dev/null
@@ -1,19 +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 MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
-#define MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/engine/webrtc_media_engine.h"
-
-#endif // MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
diff --git a/media/engine/webrtcvideoengine.h b/media/engine/webrtcvideoengine.h
deleted file mode 100644
index dac04eb..0000000
--- a/media/engine/webrtcvideoengine.h
+++ /dev/null
@@ -1,19 +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 MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
-#define MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/engine/webrtc_video_engine.h"
-
-#endif // MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
diff --git a/media/engine/webrtcvoiceengine.h b/media/engine/webrtcvoiceengine.h
deleted file mode 100644
index aa02a82..0000000
--- a/media/engine/webrtcvoiceengine.h
+++ /dev/null
@@ -1,19 +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 MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
-#define MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/engine/webrtc_voice_engine.h"
-
-#endif // MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
diff --git a/media/sctp/sctptransport.h b/media/sctp/sctptransport.h
deleted file mode 100644
index d7de55c..0000000
--- a/media/sctp/sctptransport.h
+++ /dev/null
@@ -1,19 +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 MEDIA_SCTP_SCTPTRANSPORT_H_
-#define MEDIA_SCTP_SCTPTRANSPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/sctp/sctp_transport.h"
-
-#endif // MEDIA_SCTP_SCTPTRANSPORT_H_
diff --git a/media/sctp/sctptransportinternal.h b/media/sctp/sctptransportinternal.h
deleted file mode 100644
index 96b4fd4..0000000
--- a/media/sctp/sctptransportinternal.h
+++ /dev/null
@@ -1,19 +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 MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_
-#define MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "media/sctp/sctp_transport_internal.h"
-
-#endif // MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_
diff --git a/modules/audio_processing/noise_suppression_proxy.h b/modules/audio_processing/noise_suppression_proxy.h
index b5afe92..959887f 100644
--- a/modules/audio_processing/noise_suppression_proxy.h
+++ b/modules/audio_processing/noise_suppression_proxy.h
@@ -14,7 +14,7 @@
#include <vector>
#include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
namespace webrtc {
// This class ensures interoperability with the pointer-to-submodule interface
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 775ebbd..4ccb2fc 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -20,27 +20,19 @@
sources = [
"base/async_stun_tcp_socket.cc",
"base/async_stun_tcp_socket.h",
- "base/asyncstuntcpsocket.h",
"base/basic_async_resolver_factory.cc",
"base/basic_async_resolver_factory.h",
"base/basic_packet_socket_factory.cc",
"base/basic_packet_socket_factory.h",
- "base/basicasyncresolverfactory.h",
- "base/basicpacketsocketfactory.h",
"base/candidate_pair_interface.h",
- "base/candidatepairinterface.h",
"base/dtls_transport.cc",
"base/dtls_transport.h",
"base/dtls_transport_internal.cc",
"base/dtls_transport_internal.h",
- "base/dtlstransport.h",
- "base/dtlstransportinternal.h",
"base/ice_credentials_iterator.cc",
"base/ice_credentials_iterator.h",
"base/ice_transport_internal.cc",
"base/ice_transport_internal.h",
- "base/icecredentialsiterator.h",
- "base/icetransportinternal.h",
"base/mdns_message.cc",
"base/mdns_message.h",
"base/no_op_dtls_transport.cc",
@@ -49,8 +41,6 @@
"base/p2p_constants.h",
"base/p2p_transport_channel.cc",
"base/p2p_transport_channel.h",
- "base/p2pconstants.h",
- "base/p2ptransportchannel.h",
"base/packet_loss_estimator.cc",
"base/packet_loss_estimator.h",
"base/packet_socket_factory.cc",
@@ -58,38 +48,26 @@
"base/packet_transport_interface.h",
"base/packet_transport_internal.cc",
"base/packet_transport_internal.h",
- "base/packetlossestimator.h",
- "base/packetsocketfactory.h",
- "base/packettransportinterface.h",
- "base/packettransportinternal.h",
"base/port.cc",
"base/port.h",
"base/port_allocator.cc",
"base/port_allocator.h",
"base/port_interface.cc",
"base/port_interface.h",
- "base/portallocator.h",
- "base/portinterface.h",
"base/pseudo_tcp.cc",
"base/pseudo_tcp.h",
- "base/pseudotcp.h",
"base/regathering_controller.cc",
"base/regathering_controller.h",
- "base/regatheringcontroller.h",
"base/relay_port.cc",
"base/relay_port.h",
- "base/relayport.h",
"base/stun.cc",
"base/stun.h",
"base/stun_port.cc",
"base/stun_port.h",
"base/stun_request.cc",
"base/stun_request.h",
- "base/stunport.h",
- "base/stunrequest.h",
"base/tcp_port.cc",
"base/tcp_port.h",
- "base/tcpport.h",
"base/transport.h",
"base/transport_description.cc",
"base/transport_description.h",
@@ -97,23 +75,14 @@
"base/transport_description_factory.h",
"base/transport_factory_interface.h",
"base/transport_info.h",
- "base/transportdescription.h",
- "base/transportdescriptionfactory.h",
- "base/transportfactoryinterface.h",
- "base/transportinfo.h",
"base/turn_port.cc",
"base/turn_port.h",
- "base/turnport.h",
"base/udp_port.h",
- "base/udpport.h",
"client/basic_port_allocator.cc",
"client/basic_port_allocator.h",
- "client/basicportallocator.h",
"client/relay_port_factory_interface.h",
- "client/relayportfactoryinterface.h",
"client/turn_port_factory.cc",
"client/turn_port_factory.h",
- "client/turnportfactory.h",
]
deps = [
@@ -154,24 +123,13 @@
"base/fake_ice_transport.h",
"base/fake_packet_transport.h",
"base/fake_port_allocator.h",
- "base/fakecandidatepair.h",
- "base/fakedtlstransport.h",
- "base/fakeicetransport.h",
- "base/fakepackettransport.h",
- "base/fakeportallocator.h",
"base/mock_async_resolver.h",
"base/mock_ice_transport.h",
- "base/mockasyncresolver.h",
- "base/mockicetransport.h",
"base/test_relay_server.h",
"base/test_stun_server.cc",
"base/test_stun_server.h",
"base/test_turn_customizer.h",
"base/test_turn_server.h",
- "base/testrelayserver.h",
- "base/teststunserver.h",
- "base/testturncustomizer.h",
- "base/testturnserver.h",
]
deps = [
":p2p_server_utils",
@@ -249,13 +207,10 @@
sources = [
"base/relay_server.cc",
"base/relay_server.h",
- "base/relayserver.h",
"base/stun_server.cc",
"base/stun_server.h",
- "base/stunserver.h",
"base/turn_server.cc",
"base/turn_server.h",
- "base/turnserver.h",
]
deps = [
":rtc_p2p",
@@ -272,7 +227,6 @@
sources = [
"stunprober/stun_prober.cc",
"stunprober/stun_prober.h",
- "stunprober/stunprober.h",
]
deps = [
diff --git a/p2p/base/asyncstuntcpsocket.h b/p2p/base/asyncstuntcpsocket.h
deleted file mode 100644
index a117d38..0000000
--- a/p2p/base/asyncstuntcpsocket.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_ASYNCSTUNTCPSOCKET_H_
-#define P2P_BASE_ASYNCSTUNTCPSOCKET_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/async_stun_tcp_socket.h"
-
-#endif // P2P_BASE_ASYNCSTUNTCPSOCKET_H_
diff --git a/p2p/base/basicasyncresolverfactory.h b/p2p/base/basicasyncresolverfactory.h
deleted file mode 100644
index 81ec064..0000000
--- a/p2p/base/basicasyncresolverfactory.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_BASICASYNCRESOLVERFACTORY_H_
-#define P2P_BASE_BASICASYNCRESOLVERFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/basic_async_resolver_factory.h"
-
-#endif // P2P_BASE_BASICASYNCRESOLVERFACTORY_H_
diff --git a/p2p/base/basicpacketsocketfactory.h b/p2p/base/basicpacketsocketfactory.h
deleted file mode 100644
index 6981bfa..0000000
--- a/p2p/base/basicpacketsocketfactory.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_BASICPACKETSOCKETFACTORY_H_
-#define P2P_BASE_BASICPACKETSOCKETFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/basic_packet_socket_factory.h"
-
-#endif // P2P_BASE_BASICPACKETSOCKETFACTORY_H_
diff --git a/p2p/base/candidatepairinterface.h b/p2p/base/candidatepairinterface.h
deleted file mode 100644
index a8043c2..0000000
--- a/p2p/base/candidatepairinterface.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_CANDIDATEPAIRINTERFACE_H_
-#define P2P_BASE_CANDIDATEPAIRINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/candidate_pair_interface.h"
-
-#endif // P2P_BASE_CANDIDATEPAIRINTERFACE_H_
diff --git a/p2p/base/dtlstransport.h b/p2p/base/dtlstransport.h
deleted file mode 100644
index 22da187..0000000
--- a/p2p/base/dtlstransport.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_DTLSTRANSPORT_H_
-#define P2P_BASE_DTLSTRANSPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/dtls_transport.h"
-
-#endif // P2P_BASE_DTLSTRANSPORT_H_
diff --git a/p2p/base/dtlstransportinternal.h b/p2p/base/dtlstransportinternal.h
deleted file mode 100644
index 4c9feeb..0000000
--- a/p2p/base/dtlstransportinternal.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_DTLSTRANSPORTINTERNAL_H_
-#define P2P_BASE_DTLSTRANSPORTINTERNAL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/dtls_transport_internal.h"
-
-#endif // P2P_BASE_DTLSTRANSPORTINTERNAL_H_
diff --git a/p2p/base/fakecandidatepair.h b/p2p/base/fakecandidatepair.h
deleted file mode 100644
index c085d40..0000000
--- a/p2p/base/fakecandidatepair.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_FAKECANDIDATEPAIR_H_
-#define P2P_BASE_FAKECANDIDATEPAIR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/fake_candidate_pair.h"
-
-#endif // P2P_BASE_FAKECANDIDATEPAIR_H_
diff --git a/p2p/base/fakedtlstransport.h b/p2p/base/fakedtlstransport.h
deleted file mode 100644
index b387d88..0000000
--- a/p2p/base/fakedtlstransport.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_FAKEDTLSTRANSPORT_H_
-#define P2P_BASE_FAKEDTLSTRANSPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/fake_dtls_transport.h"
-
-#endif // P2P_BASE_FAKEDTLSTRANSPORT_H_
diff --git a/p2p/base/fakeicetransport.h b/p2p/base/fakeicetransport.h
deleted file mode 100644
index 5d98e60..0000000
--- a/p2p/base/fakeicetransport.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_FAKEICETRANSPORT_H_
-#define P2P_BASE_FAKEICETRANSPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/fake_ice_transport.h"
-
-#endif // P2P_BASE_FAKEICETRANSPORT_H_
diff --git a/p2p/base/fakepackettransport.h b/p2p/base/fakepackettransport.h
deleted file mode 100644
index 643e8ad..0000000
--- a/p2p/base/fakepackettransport.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_FAKEPACKETTRANSPORT_H_
-#define P2P_BASE_FAKEPACKETTRANSPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/fake_packet_transport.h"
-
-#endif // P2P_BASE_FAKEPACKETTRANSPORT_H_
diff --git a/p2p/base/fakeportallocator.h b/p2p/base/fakeportallocator.h
deleted file mode 100644
index 19da527..0000000
--- a/p2p/base/fakeportallocator.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_FAKEPORTALLOCATOR_H_
-#define P2P_BASE_FAKEPORTALLOCATOR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/fake_port_allocator.h"
-
-#endif // P2P_BASE_FAKEPORTALLOCATOR_H_
diff --git a/p2p/base/icecredentialsiterator.h b/p2p/base/icecredentialsiterator.h
deleted file mode 100644
index 90260bc..0000000
--- a/p2p/base/icecredentialsiterator.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_ICECREDENTIALSITERATOR_H_
-#define P2P_BASE_ICECREDENTIALSITERATOR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/ice_credentials_iterator.h"
-
-#endif // P2P_BASE_ICECREDENTIALSITERATOR_H_
diff --git a/p2p/base/icetransportinternal.h b/p2p/base/icetransportinternal.h
deleted file mode 100644
index 43f2548..0000000
--- a/p2p/base/icetransportinternal.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_ICETRANSPORTINTERNAL_H_
-#define P2P_BASE_ICETRANSPORTINTERNAL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/ice_transport_internal.h"
-
-#endif // P2P_BASE_ICETRANSPORTINTERNAL_H_
diff --git a/p2p/base/mockasyncresolver.h b/p2p/base/mockasyncresolver.h
deleted file mode 100644
index 26b7a40..0000000
--- a/p2p/base/mockasyncresolver.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_MOCKASYNCRESOLVER_H_
-#define P2P_BASE_MOCKASYNCRESOLVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/mock_async_resolver.h"
-
-#endif // P2P_BASE_MOCKASYNCRESOLVER_H_
diff --git a/p2p/base/mockicetransport.h b/p2p/base/mockicetransport.h
deleted file mode 100644
index e5fe0b4..0000000
--- a/p2p/base/mockicetransport.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_MOCKICETRANSPORT_H_
-#define P2P_BASE_MOCKICETRANSPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/mock_ice_transport.h"
-
-#endif // P2P_BASE_MOCKICETRANSPORT_H_
diff --git a/p2p/base/p2pconstants.h b/p2p/base/p2pconstants.h
deleted file mode 100644
index 3f2419f..0000000
--- a/p2p/base/p2pconstants.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_P2PCONSTANTS_H_
-#define P2P_BASE_P2PCONSTANTS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/p2p_constants.h"
-
-#endif // P2P_BASE_P2PCONSTANTS_H_
diff --git a/p2p/base/p2ptransportchannel.h b/p2p/base/p2ptransportchannel.h
deleted file mode 100644
index 4376d9b..0000000
--- a/p2p/base/p2ptransportchannel.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_P2PTRANSPORTCHANNEL_H_
-#define P2P_BASE_P2PTRANSPORTCHANNEL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/p2p_transport_channel.h"
-
-#endif // P2P_BASE_P2PTRANSPORTCHANNEL_H_
diff --git a/p2p/base/packetlossestimator.h b/p2p/base/packetlossestimator.h
deleted file mode 100644
index 9b4c6c4..0000000
--- a/p2p/base/packetlossestimator.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_PACKETLOSSESTIMATOR_H_
-#define P2P_BASE_PACKETLOSSESTIMATOR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/packet_loss_estimator.h"
-
-#endif // P2P_BASE_PACKETLOSSESTIMATOR_H_
diff --git a/p2p/base/packetsocketfactory.h b/p2p/base/packetsocketfactory.h
deleted file mode 100644
index b553e25..0000000
--- a/p2p/base/packetsocketfactory.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_PACKETSOCKETFACTORY_H_
-#define P2P_BASE_PACKETSOCKETFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/packet_socket_factory.h"
-
-#endif // P2P_BASE_PACKETSOCKETFACTORY_H_
diff --git a/p2p/base/packettransportinterface.h b/p2p/base/packettransportinterface.h
deleted file mode 100644
index 66f486d..0000000
--- a/p2p/base/packettransportinterface.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_PACKETTRANSPORTINTERFACE_H_
-#define P2P_BASE_PACKETTRANSPORTINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/packet_transport_interface.h"
-
-#endif // P2P_BASE_PACKETTRANSPORTINTERFACE_H_
diff --git a/p2p/base/packettransportinternal.h b/p2p/base/packettransportinternal.h
deleted file mode 100644
index 40ad733..0000000
--- a/p2p/base/packettransportinternal.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_PACKETTRANSPORTINTERNAL_H_
-#define P2P_BASE_PACKETTRANSPORTINTERNAL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/packet_transport_internal.h"
-
-#endif // P2P_BASE_PACKETTRANSPORTINTERNAL_H_
diff --git a/p2p/base/portallocator.h b/p2p/base/portallocator.h
deleted file mode 100644
index ca26648..0000000
--- a/p2p/base/portallocator.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_PORTALLOCATOR_H_
-#define P2P_BASE_PORTALLOCATOR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/port_allocator.h"
-
-#endif // P2P_BASE_PORTALLOCATOR_H_
diff --git a/p2p/base/portinterface.h b/p2p/base/portinterface.h
deleted file mode 100644
index 7631d95..0000000
--- a/p2p/base/portinterface.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_PORTINTERFACE_H_
-#define P2P_BASE_PORTINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/port_interface.h"
-
-#endif // P2P_BASE_PORTINTERFACE_H_
diff --git a/p2p/base/pseudotcp.h b/p2p/base/pseudotcp.h
deleted file mode 100644
index b998133..0000000
--- a/p2p/base/pseudotcp.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_PSEUDOTCP_H_
-#define P2P_BASE_PSEUDOTCP_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/pseudo_tcp.h"
-
-#endif // P2P_BASE_PSEUDOTCP_H_
diff --git a/p2p/base/regatheringcontroller.h b/p2p/base/regatheringcontroller.h
deleted file mode 100644
index 32d3932..0000000
--- a/p2p/base/regatheringcontroller.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_REGATHERINGCONTROLLER_H_
-#define P2P_BASE_REGATHERINGCONTROLLER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/regathering_controller.h"
-
-#endif // P2P_BASE_REGATHERINGCONTROLLER_H_
diff --git a/p2p/base/relayport.h b/p2p/base/relayport.h
deleted file mode 100644
index 13a5be7..0000000
--- a/p2p/base/relayport.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_RELAYPORT_H_
-#define P2P_BASE_RELAYPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/relay_port.h"
-
-#endif // P2P_BASE_RELAYPORT_H_
diff --git a/p2p/base/relayserver.h b/p2p/base/relayserver.h
deleted file mode 100644
index ae8ab41..0000000
--- a/p2p/base/relayserver.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_RELAYSERVER_H_
-#define P2P_BASE_RELAYSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/relay_server.h"
-
-#endif // P2P_BASE_RELAYSERVER_H_
diff --git a/p2p/base/stunport.h b/p2p/base/stunport.h
deleted file mode 100644
index 082d2c5..0000000
--- a/p2p/base/stunport.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_STUNPORT_H_
-#define P2P_BASE_STUNPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/stun_port.h"
-
-#endif // P2P_BASE_STUNPORT_H_
diff --git a/p2p/base/stunrequest.h b/p2p/base/stunrequest.h
deleted file mode 100644
index b0985f6..0000000
--- a/p2p/base/stunrequest.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_STUNREQUEST_H_
-#define P2P_BASE_STUNREQUEST_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/stun_request.h"
-
-#endif // P2P_BASE_STUNREQUEST_H_
diff --git a/p2p/base/stunserver.h b/p2p/base/stunserver.h
deleted file mode 100644
index 40ce23f..0000000
--- a/p2p/base/stunserver.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_STUNSERVER_H_
-#define P2P_BASE_STUNSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/stun_server.h"
-
-#endif // P2P_BASE_STUNSERVER_H_
diff --git a/p2p/base/tcpport.h b/p2p/base/tcpport.h
deleted file mode 100644
index 569abd0..0000000
--- a/p2p/base/tcpport.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_TCPPORT_H_
-#define P2P_BASE_TCPPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/tcp_port.h"
-
-#endif // P2P_BASE_TCPPORT_H_
diff --git a/p2p/base/testrelayserver.h b/p2p/base/testrelayserver.h
deleted file mode 100644
index 4503c94..0000000
--- a/p2p/base/testrelayserver.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_TESTRELAYSERVER_H_
-#define P2P_BASE_TESTRELAYSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/test_relay_server.h"
-
-#endif // P2P_BASE_TESTRELAYSERVER_H_
diff --git a/p2p/base/teststunserver.h b/p2p/base/teststunserver.h
deleted file mode 100644
index 64fdda0..0000000
--- a/p2p/base/teststunserver.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_TESTSTUNSERVER_H_
-#define P2P_BASE_TESTSTUNSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/test_stun_server.h"
-
-#endif // P2P_BASE_TESTSTUNSERVER_H_
diff --git a/p2p/base/testturncustomizer.h b/p2p/base/testturncustomizer.h
deleted file mode 100644
index 49ec42e..0000000
--- a/p2p/base/testturncustomizer.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_TESTTURNCUSTOMIZER_H_
-#define P2P_BASE_TESTTURNCUSTOMIZER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/test_turn_customizer.h"
-
-#endif // P2P_BASE_TESTTURNCUSTOMIZER_H_
diff --git a/p2p/base/testturnserver.h b/p2p/base/testturnserver.h
deleted file mode 100644
index a5d07a7..0000000
--- a/p2p/base/testturnserver.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_TESTTURNSERVER_H_
-#define P2P_BASE_TESTTURNSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/test_turn_server.h"
-
-#endif // P2P_BASE_TESTTURNSERVER_H_
diff --git a/p2p/base/transportdescription.h b/p2p/base/transportdescription.h
deleted file mode 100644
index ab64f27..0000000
--- a/p2p/base/transportdescription.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_TRANSPORTDESCRIPTION_H_
-#define P2P_BASE_TRANSPORTDESCRIPTION_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/transport_description.h"
-
-#endif // P2P_BASE_TRANSPORTDESCRIPTION_H_
diff --git a/p2p/base/transportdescriptionfactory.h b/p2p/base/transportdescriptionfactory.h
deleted file mode 100644
index 05f2791..0000000
--- a/p2p/base/transportdescriptionfactory.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
-#define P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/transport_description_factory.h"
-
-#endif // P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
diff --git a/p2p/base/transportfactoryinterface.h b/p2p/base/transportfactoryinterface.h
deleted file mode 100644
index e16ccf4..0000000
--- a/p2p/base/transportfactoryinterface.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_TRANSPORTFACTORYINTERFACE_H_
-#define P2P_BASE_TRANSPORTFACTORYINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/transport_factory_interface.h"
-
-#endif // P2P_BASE_TRANSPORTFACTORYINTERFACE_H_
diff --git a/p2p/base/transportinfo.h b/p2p/base/transportinfo.h
deleted file mode 100644
index 98d9e77..0000000
--- a/p2p/base/transportinfo.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_TRANSPORTINFO_H_
-#define P2P_BASE_TRANSPORTINFO_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/transport_info.h"
-
-#endif // P2P_BASE_TRANSPORTINFO_H_
diff --git a/p2p/base/turnport.h b/p2p/base/turnport.h
deleted file mode 100644
index ea4b838..0000000
--- a/p2p/base/turnport.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_TURNPORT_H_
-#define P2P_BASE_TURNPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/turn_port.h"
-
-#endif // P2P_BASE_TURNPORT_H_
diff --git a/p2p/base/turnserver.h b/p2p/base/turnserver.h
deleted file mode 100644
index 89dde8c..0000000
--- a/p2p/base/turnserver.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_TURNSERVER_H_
-#define P2P_BASE_TURNSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/turn_server.h"
-
-#endif // P2P_BASE_TURNSERVER_H_
diff --git a/p2p/base/udpport.h b/p2p/base/udpport.h
deleted file mode 100644
index edb5e26..0000000
--- a/p2p/base/udpport.h
+++ /dev/null
@@ -1,19 +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 P2P_BASE_UDPPORT_H_
-#define P2P_BASE_UDPPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/base/udp_port.h"
-
-#endif // P2P_BASE_UDPPORT_H_
diff --git a/p2p/client/basicportallocator.h b/p2p/client/basicportallocator.h
deleted file mode 100644
index b429ed8..0000000
--- a/p2p/client/basicportallocator.h
+++ /dev/null
@@ -1,19 +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 P2P_CLIENT_BASICPORTALLOCATOR_H_
-#define P2P_CLIENT_BASICPORTALLOCATOR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/client/basic_port_allocator.h"
-
-#endif // P2P_CLIENT_BASICPORTALLOCATOR_H_
diff --git a/p2p/client/relayportfactoryinterface.h b/p2p/client/relayportfactoryinterface.h
deleted file mode 100644
index 20baa28..0000000
--- a/p2p/client/relayportfactoryinterface.h
+++ /dev/null
@@ -1,19 +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 P2P_CLIENT_RELAYPORTFACTORYINTERFACE_H_
-#define P2P_CLIENT_RELAYPORTFACTORYINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/client/relay_port_factory_interface.h"
-
-#endif // P2P_CLIENT_RELAYPORTFACTORYINTERFACE_H_
diff --git a/p2p/client/turnportfactory.h b/p2p/client/turnportfactory.h
deleted file mode 100644
index a2dcab4..0000000
--- a/p2p/client/turnportfactory.h
+++ /dev/null
@@ -1,19 +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 P2P_CLIENT_TURNPORTFACTORY_H_
-#define P2P_CLIENT_TURNPORTFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/client/turn_port_factory.h"
-
-#endif // P2P_CLIENT_TURNPORTFACTORY_H_
diff --git a/p2p/stunprober/stunprober.h b/p2p/stunprober/stunprober.h
deleted file mode 100644
index edaa306..0000000
--- a/p2p/stunprober/stunprober.h
+++ /dev/null
@@ -1,19 +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 P2P_STUNPROBER_STUNPROBER_H_
-#define P2P_STUNPROBER_STUNPROBER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "p2p/stunprober/stun_prober.h"
-
-#endif // P2P_STUNPROBER_STUNPROBER_H_
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 7c16753..8dab052 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -34,57 +34,38 @@
"channel_interface.h",
"channel_manager.cc",
"channel_manager.h",
- "channelinterface.h",
- "channelmanager.h",
"dtls_srtp_transport.cc",
"dtls_srtp_transport.h",
"dtls_transport.cc",
"dtls_transport.h",
- "dtlssrtptransport.h",
- "dtlstransport.h",
"external_hmac.cc",
"external_hmac.h",
- "externalhmac.h",
"jsep_transport.cc",
"jsep_transport.h",
"jsep_transport_controller.cc",
"jsep_transport_controller.h",
- "jseptransport.h",
- "jseptransportcontroller.h",
"media_session.cc",
"media_session.h",
- "mediasession.h",
"rtcp_mux_filter.cc",
"rtcp_mux_filter.h",
- "rtcpmuxfilter.h",
"rtp_media_utils.cc",
"rtp_media_utils.h",
"rtp_transport.cc",
"rtp_transport.h",
"rtp_transport_internal.h",
"rtp_transport_internal_adapter.h",
- "rtpmediautils.h",
- "rtptransport.h",
- "rtptransportinternal.h",
- "rtptransportinternaladapter.h",
"session_description.cc",
"session_description.h",
- "sessiondescription.h",
"simulcast_description.cc",
"simulcast_description.h",
- "simulcastdescription.h",
"srtp_filter.cc",
"srtp_filter.h",
"srtp_session.cc",
"srtp_session.h",
"srtp_transport.cc",
"srtp_transport.h",
- "srtpfilter.h",
- "srtpsession.h",
- "srtptransport.h",
"transport_stats.cc",
"transport_stats.h",
- "transportstats.h",
]
deps = [
@@ -146,46 +127,32 @@
sources = [
"audio_track.cc",
"audio_track.h",
- "audiotrack.h",
"data_channel.cc",
"data_channel.h",
- "datachannel.h",
"dtmf_sender.cc",
"dtmf_sender.h",
- "dtmfsender.h",
"ice_server_parsing.cc",
"ice_server_parsing.h",
- "iceserverparsing.h",
"jsep_ice_candidate.cc",
"jsep_session_description.cc",
"local_audio_source.cc",
"local_audio_source.h",
- "localaudiosource.h",
"media_stream.cc",
"media_stream.h",
"media_stream_observer.cc",
"media_stream_observer.h",
"media_stream_track.h",
- "mediastream.h",
- "mediastreamobserver.h",
- "mediastreamtrack.h",
"peer_connection.cc",
"peer_connection.h",
"peer_connection_factory.cc",
"peer_connection_factory.h",
"peer_connection_internal.h",
- "peerconnection.h",
- "peerconnectionfactory.h",
- "peerconnectioninternal.h",
"remote_audio_source.cc",
"remote_audio_source.h",
- "remoteaudiosource.h",
"rtc_stats_collector.cc",
"rtc_stats_collector.h",
"rtc_stats_traversal.cc",
"rtc_stats_traversal.h",
- "rtcstatscollector.h",
- "rtcstatstraversal.h",
"rtp_parameters_conversion.cc",
"rtp_parameters_conversion.h",
"rtp_receiver.cc",
@@ -194,42 +161,27 @@
"rtp_sender.h",
"rtp_transceiver.cc",
"rtp_transceiver.h",
- "rtpparametersconversion.h",
- "rtpreceiver.h",
- "rtpsender.h",
- "rtptransceiver.h",
"sctp_utils.cc",
"sctp_utils.h",
- "sctputils.h",
"sdp_serializer.cc",
"sdp_serializer.h",
"sdp_utils.cc",
"sdp_utils.h",
- "sdpserializer.h",
- "sdputils.h",
"stats_collector.cc",
"stats_collector.h",
- "statscollector.h",
"stream_collection.h",
- "streamcollection.h",
"track_media_info_map.cc",
"track_media_info_map.h",
- "trackmediainfomap.h",
"video_capturer_track_source.cc",
"video_capturer_track_source.h",
"video_track.cc",
"video_track.h",
"video_track_source.cc",
"video_track_source.h",
- "videocapturertracksource.h",
- "videotrack.h",
- "videotracksource.h",
"webrtc_sdp.cc",
"webrtc_sdp.h",
"webrtc_session_description_factory.cc",
"webrtc_session_description_factory.h",
- "webrtcsdp.h",
- "webrtcsessiondescriptionfactory.h",
]
if (!build_with_chromium && is_clang) {
@@ -297,12 +249,10 @@
"media_session_unittest.cc",
"rtcp_mux_filter_unittest.cc",
"rtp_transport_unittest.cc",
- "rtptransporttestutil.h",
"session_description_unittest.cc",
"srtp_filter_unittest.cc",
"srtp_session_unittest.cc",
"srtp_transport_unittest.cc",
- "srtptestutil.h",
"test/rtp_transport_test_util.h",
"test/srtp_test_util.h",
]
@@ -403,7 +353,6 @@
sources = [
"peer_connection_wrapper.cc",
"peer_connection_wrapper.h",
- "peerconnectionwrapper.h",
]
deps = [
":pc_test_utils",
@@ -436,35 +385,16 @@
"test/fake_sctp_transport.h",
"test/fake_video_track_renderer.h",
"test/fake_video_track_source.h",
- "test/fakeaudiocapturemodule.h",
- "test/fakedatachannelprovider.h",
- "test/fakepeerconnectionbase.h",
- "test/fakepeerconnectionforstats.h",
- "test/fakeperiodicvideosource.h",
- "test/fakeperiodicvideotracksource.h",
- "test/fakertccertificategenerator.h",
- "test/fakesctptransport.h",
- "test/fakevideotrackrenderer.h",
- "test/fakevideotracksource.h",
"test/frame_generator_capturer_video_track_source.h",
- "test/framegeneratorcapturervideotracksource.h",
"test/mock_channel_interface.h",
- "test/mock_channelinterface.h",
"test/mock_data_channel.h",
- "test/mock_datachannel.h",
"test/mock_peer_connection_observers.h",
"test/mock_rtp_receiver_internal.h",
"test/mock_rtp_sender_internal.h",
- "test/mock_rtpreceiverinternal.h",
- "test/mock_rtpsenderinternal.h",
- "test/mockpeerconnectionobservers.h",
"test/peer_connection_test_wrapper.cc",
"test/peer_connection_test_wrapper.h",
- "test/peerconnectiontestwrapper.h",
"test/rtc_stats_obtainer.h",
- "test/rtcstatsobtainer.h",
"test/test_sdp_strings.h",
- "test/testsdpstrings.h",
]
deps = [
@@ -539,7 +469,6 @@
"peer_connection_signaling_unittest.cc",
"peer_connection_wrapper.cc",
"peer_connection_wrapper.h",
- "peerconnectionwrapper.h",
"proxy_unittest.cc",
"rtc_stats_collector_unittest.cc",
"rtc_stats_integrationtest.cc",
@@ -553,7 +482,6 @@
"stats_collector_unittest.cc",
"test/fake_audio_capture_module_unittest.cc",
"test/test_sdp_strings.h",
- "test/testsdpstrings.h",
"track_media_info_map_unittest.cc",
"video_capturer_track_source_unittest.cc",
"video_track_unittest.cc",
@@ -665,7 +593,6 @@
sources = [
"test/android_test_initializer.cc",
"test/android_test_initializer.h",
- "test/androidtestinitializer.h",
]
deps = [
"../sdk/android:libjingle_peerconnection_jni",
diff --git a/pc/audiotrack.h b/pc/audiotrack.h
deleted file mode 100644
index dc249ba..0000000
--- a/pc/audiotrack.h
+++ /dev/null
@@ -1,19 +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 PC_AUDIOTRACK_H_
-#define PC_AUDIOTRACK_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/audio_track.h"
-
-#endif // PC_AUDIOTRACK_H_
diff --git a/pc/channelinterface.h b/pc/channelinterface.h
deleted file mode 100644
index 25351ed..0000000
--- a/pc/channelinterface.h
+++ /dev/null
@@ -1,19 +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 PC_CHANNELINTERFACE_H_
-#define PC_CHANNELINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/channel_interface.h"
-
-#endif // PC_CHANNELINTERFACE_H_
diff --git a/pc/channelmanager.h b/pc/channelmanager.h
deleted file mode 100644
index 5da215d..0000000
--- a/pc/channelmanager.h
+++ /dev/null
@@ -1,19 +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 PC_CHANNELMANAGER_H_
-#define PC_CHANNELMANAGER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/channel_manager.h"
-
-#endif // PC_CHANNELMANAGER_H_
diff --git a/pc/datachannel.h b/pc/datachannel.h
deleted file mode 100644
index da8e6f2..0000000
--- a/pc/datachannel.h
+++ /dev/null
@@ -1,19 +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 PC_DATACHANNEL_H_
-#define PC_DATACHANNEL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/data_channel.h"
-
-#endif // PC_DATACHANNEL_H_
diff --git a/pc/dtlssrtptransport.h b/pc/dtlssrtptransport.h
deleted file mode 100644
index ba20bd7..0000000
--- a/pc/dtlssrtptransport.h
+++ /dev/null
@@ -1,19 +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 PC_DTLSSRTPTRANSPORT_H_
-#define PC_DTLSSRTPTRANSPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/dtls_srtp_transport.h"
-
-#endif // PC_DTLSSRTPTRANSPORT_H_
diff --git a/pc/dtlstransport.h b/pc/dtlstransport.h
deleted file mode 100644
index 3b979dd..0000000
--- a/pc/dtlstransport.h
+++ /dev/null
@@ -1,19 +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 PC_DTLSTRANSPORT_H_
-#define PC_DTLSTRANSPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/dtls_transport.h"
-
-#endif // PC_DTLSTRANSPORT_H_
diff --git a/pc/dtmfsender.h b/pc/dtmfsender.h
deleted file mode 100644
index ee4ec9b..0000000
--- a/pc/dtmfsender.h
+++ /dev/null
@@ -1,19 +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 PC_DTMFSENDER_H_
-#define PC_DTMFSENDER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/dtmf_sender.h"
-
-#endif // PC_DTMFSENDER_H_
diff --git a/pc/externalhmac.h b/pc/externalhmac.h
deleted file mode 100644
index afe5771..0000000
--- a/pc/externalhmac.h
+++ /dev/null
@@ -1,19 +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 PC_EXTERNALHMAC_H_
-#define PC_EXTERNALHMAC_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/external_hmac.h"
-
-#endif // PC_EXTERNALHMAC_H_
diff --git a/pc/iceserverparsing.h b/pc/iceserverparsing.h
deleted file mode 100644
index b893332..0000000
--- a/pc/iceserverparsing.h
+++ /dev/null
@@ -1,19 +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 PC_ICESERVERPARSING_H_
-#define PC_ICESERVERPARSING_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/ice_server_parsing.h"
-
-#endif // PC_ICESERVERPARSING_H_
diff --git a/pc/jseptransport.h b/pc/jseptransport.h
deleted file mode 100644
index 6d700cf..0000000
--- a/pc/jseptransport.h
+++ /dev/null
@@ -1,19 +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 PC_JSEPTRANSPORT_H_
-#define PC_JSEPTRANSPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/jsep_transport.h"
-
-#endif // PC_JSEPTRANSPORT_H_
diff --git a/pc/jseptransportcontroller.h b/pc/jseptransportcontroller.h
deleted file mode 100644
index 8b64cfb..0000000
--- a/pc/jseptransportcontroller.h
+++ /dev/null
@@ -1,19 +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 PC_JSEPTRANSPORTCONTROLLER_H_
-#define PC_JSEPTRANSPORTCONTROLLER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/jsep_transport_controller.h"
-
-#endif // PC_JSEPTRANSPORTCONTROLLER_H_
diff --git a/pc/localaudiosource.h b/pc/localaudiosource.h
deleted file mode 100644
index 1cd73dd..0000000
--- a/pc/localaudiosource.h
+++ /dev/null
@@ -1,19 +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 PC_LOCALAUDIOSOURCE_H_
-#define PC_LOCALAUDIOSOURCE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/local_audio_source.h"
-
-#endif // PC_LOCALAUDIOSOURCE_H_
diff --git a/pc/mediasession.h b/pc/mediasession.h
deleted file mode 100644
index 0ae7192..0000000
--- a/pc/mediasession.h
+++ /dev/null
@@ -1,19 +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 PC_MEDIASESSION_H_
-#define PC_MEDIASESSION_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/media_session.h"
-
-#endif // PC_MEDIASESSION_H_
diff --git a/pc/mediastream.h b/pc/mediastream.h
deleted file mode 100644
index 806303e..0000000
--- a/pc/mediastream.h
+++ /dev/null
@@ -1,19 +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 PC_MEDIASTREAM_H_
-#define PC_MEDIASTREAM_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/media_stream.h"
-
-#endif // PC_MEDIASTREAM_H_
diff --git a/pc/mediastreamobserver.h b/pc/mediastreamobserver.h
deleted file mode 100644
index 55ba556..0000000
--- a/pc/mediastreamobserver.h
+++ /dev/null
@@ -1,19 +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 PC_MEDIASTREAMOBSERVER_H_
-#define PC_MEDIASTREAMOBSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/media_stream_observer.h"
-
-#endif // PC_MEDIASTREAMOBSERVER_H_
diff --git a/pc/mediastreamtrack.h b/pc/mediastreamtrack.h
deleted file mode 100644
index 19b9693..0000000
--- a/pc/mediastreamtrack.h
+++ /dev/null
@@ -1,19 +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 PC_MEDIASTREAMTRACK_H_
-#define PC_MEDIASTREAMTRACK_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/media_stream_track.h"
-
-#endif // PC_MEDIASTREAMTRACK_H_
diff --git a/pc/peerconnection.h b/pc/peerconnection.h
deleted file mode 100644
index 508b4d0..0000000
--- a/pc/peerconnection.h
+++ /dev/null
@@ -1,19 +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 PC_PEERCONNECTION_H_
-#define PC_PEERCONNECTION_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/peer_connection.h"
-
-#endif // PC_PEERCONNECTION_H_
diff --git a/pc/peerconnectionfactory.h b/pc/peerconnectionfactory.h
deleted file mode 100644
index 8bda34d..0000000
--- a/pc/peerconnectionfactory.h
+++ /dev/null
@@ -1,19 +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 PC_PEERCONNECTIONFACTORY_H_
-#define PC_PEERCONNECTIONFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/peer_connection_factory.h"
-
-#endif // PC_PEERCONNECTIONFACTORY_H_
diff --git a/pc/peerconnectioninternal.h b/pc/peerconnectioninternal.h
deleted file mode 100644
index c56a355..0000000
--- a/pc/peerconnectioninternal.h
+++ /dev/null
@@ -1,19 +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 PC_PEERCONNECTIONINTERNAL_H_
-#define PC_PEERCONNECTIONINTERNAL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/peer_connection_internal.h"
-
-#endif // PC_PEERCONNECTIONINTERNAL_H_
diff --git a/pc/peerconnectionwrapper.h b/pc/peerconnectionwrapper.h
deleted file mode 100644
index 5cb3cd8..0000000
--- a/pc/peerconnectionwrapper.h
+++ /dev/null
@@ -1,19 +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 PC_PEERCONNECTIONWRAPPER_H_
-#define PC_PEERCONNECTIONWRAPPER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/peer_connection_wrapper.h"
-
-#endif // PC_PEERCONNECTIONWRAPPER_H_
diff --git a/pc/remoteaudiosource.h b/pc/remoteaudiosource.h
deleted file mode 100644
index 5cbd85f..0000000
--- a/pc/remoteaudiosource.h
+++ /dev/null
@@ -1,19 +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 PC_REMOTEAUDIOSOURCE_H_
-#define PC_REMOTEAUDIOSOURCE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/remote_audio_source.h"
-
-#endif // PC_REMOTEAUDIOSOURCE_H_
diff --git a/pc/rtcpmuxfilter.h b/pc/rtcpmuxfilter.h
deleted file mode 100644
index ab6b58c..0000000
--- a/pc/rtcpmuxfilter.h
+++ /dev/null
@@ -1,19 +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 PC_RTCPMUXFILTER_H_
-#define PC_RTCPMUXFILTER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/rtcp_mux_filter.h"
-
-#endif // PC_RTCPMUXFILTER_H_
diff --git a/pc/rtcstatscollector.h b/pc/rtcstatscollector.h
deleted file mode 100644
index 2f054ca..0000000
--- a/pc/rtcstatscollector.h
+++ /dev/null
@@ -1,19 +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 PC_RTCSTATSCOLLECTOR_H_
-#define PC_RTCSTATSCOLLECTOR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/rtc_stats_collector.h"
-
-#endif // PC_RTCSTATSCOLLECTOR_H_
diff --git a/pc/rtcstatstraversal.h b/pc/rtcstatstraversal.h
deleted file mode 100644
index a1bb263..0000000
--- a/pc/rtcstatstraversal.h
+++ /dev/null
@@ -1,19 +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 PC_RTCSTATSTRAVERSAL_H_
-#define PC_RTCSTATSTRAVERSAL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/rtc_stats_traversal.h"
-
-#endif // PC_RTCSTATSTRAVERSAL_H_
diff --git a/pc/rtpmediautils.h b/pc/rtpmediautils.h
deleted file mode 100644
index cca4f65..0000000
--- a/pc/rtpmediautils.h
+++ /dev/null
@@ -1,19 +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 PC_RTPMEDIAUTILS_H_
-#define PC_RTPMEDIAUTILS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/rtp_media_utils.h"
-
-#endif // PC_RTPMEDIAUTILS_H_
diff --git a/pc/rtpparametersconversion.h b/pc/rtpparametersconversion.h
deleted file mode 100644
index c80af1a..0000000
--- a/pc/rtpparametersconversion.h
+++ /dev/null
@@ -1,19 +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 PC_RTPPARAMETERSCONVERSION_H_
-#define PC_RTPPARAMETERSCONVERSION_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/rtp_parameters_conversion.h"
-
-#endif // PC_RTPPARAMETERSCONVERSION_H_
diff --git a/pc/rtpreceiver.h b/pc/rtpreceiver.h
deleted file mode 100644
index 48e242b..0000000
--- a/pc/rtpreceiver.h
+++ /dev/null
@@ -1,19 +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 PC_RTPRECEIVER_H_
-#define PC_RTPRECEIVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/rtp_receiver.h"
-
-#endif // PC_RTPRECEIVER_H_
diff --git a/pc/rtpsender.h b/pc/rtpsender.h
deleted file mode 100644
index e99723d..0000000
--- a/pc/rtpsender.h
+++ /dev/null
@@ -1,19 +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 PC_RTPSENDER_H_
-#define PC_RTPSENDER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/rtp_sender.h"
-
-#endif // PC_RTPSENDER_H_
diff --git a/pc/rtptransceiver.h b/pc/rtptransceiver.h
deleted file mode 100644
index c2bd54a..0000000
--- a/pc/rtptransceiver.h
+++ /dev/null
@@ -1,19 +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 PC_RTPTRANSCEIVER_H_
-#define PC_RTPTRANSCEIVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/rtp_transceiver.h"
-
-#endif // PC_RTPTRANSCEIVER_H_
diff --git a/pc/rtptransport.h b/pc/rtptransport.h
deleted file mode 100644
index ed7a3c7..0000000
--- a/pc/rtptransport.h
+++ /dev/null
@@ -1,19 +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 PC_RTPTRANSPORT_H_
-#define PC_RTPTRANSPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/rtp_transport.h"
-
-#endif // PC_RTPTRANSPORT_H_
diff --git a/pc/rtptransportinternal.h b/pc/rtptransportinternal.h
deleted file mode 100644
index fe8fa90..0000000
--- a/pc/rtptransportinternal.h
+++ /dev/null
@@ -1,19 +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 PC_RTPTRANSPORTINTERNAL_H_
-#define PC_RTPTRANSPORTINTERNAL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/rtp_transport_internal.h"
-
-#endif // PC_RTPTRANSPORTINTERNAL_H_
diff --git a/pc/rtptransportinternaladapter.h b/pc/rtptransportinternaladapter.h
deleted file mode 100644
index 460217b..0000000
--- a/pc/rtptransportinternaladapter.h
+++ /dev/null
@@ -1,19 +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 PC_RTPTRANSPORTINTERNALADAPTER_H_
-#define PC_RTPTRANSPORTINTERNALADAPTER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/rtp_transport_internal_adapter.h"
-
-#endif // PC_RTPTRANSPORTINTERNALADAPTER_H_
diff --git a/pc/rtptransporttestutil.h b/pc/rtptransporttestutil.h
deleted file mode 100644
index bb2d7ae..0000000
--- a/pc/rtptransporttestutil.h
+++ /dev/null
@@ -1,19 +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 PC_RTPTRANSPORTTESTUTIL_H_
-#define PC_RTPTRANSPORTTESTUTIL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/rtp_transport_test_util.h"
-
-#endif // PC_RTPTRANSPORTTESTUTIL_H_
diff --git a/pc/sctputils.h b/pc/sctputils.h
deleted file mode 100644
index bbd0d6a..0000000
--- a/pc/sctputils.h
+++ /dev/null
@@ -1,19 +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 PC_SCTPUTILS_H_
-#define PC_SCTPUTILS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/sctp_utils.h"
-
-#endif // PC_SCTPUTILS_H_
diff --git a/pc/sdpserializer.h b/pc/sdpserializer.h
deleted file mode 100644
index e29bfba..0000000
--- a/pc/sdpserializer.h
+++ /dev/null
@@ -1,19 +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 PC_SDPSERIALIZER_H_
-#define PC_SDPSERIALIZER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/sdp_serializer.h"
-
-#endif // PC_SDPSERIALIZER_H_
diff --git a/pc/sdputils.h b/pc/sdputils.h
deleted file mode 100644
index 3bec9eb..0000000
--- a/pc/sdputils.h
+++ /dev/null
@@ -1,19 +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 PC_SDPUTILS_H_
-#define PC_SDPUTILS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/sdp_utils.h"
-
-#endif // PC_SDPUTILS_H_
diff --git a/pc/sessiondescription.h b/pc/sessiondescription.h
deleted file mode 100644
index f274309..0000000
--- a/pc/sessiondescription.h
+++ /dev/null
@@ -1,19 +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 PC_SESSIONDESCRIPTION_H_
-#define PC_SESSIONDESCRIPTION_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/session_description.h"
-
-#endif // PC_SESSIONDESCRIPTION_H_
diff --git a/pc/simulcastdescription.h b/pc/simulcastdescription.h
deleted file mode 100644
index 34330ba..0000000
--- a/pc/simulcastdescription.h
+++ /dev/null
@@ -1,19 +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 PC_SIMULCASTDESCRIPTION_H_
-#define PC_SIMULCASTDESCRIPTION_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/simulcast_description.h"
-
-#endif // PC_SIMULCASTDESCRIPTION_H_
diff --git a/pc/srtpfilter.h b/pc/srtpfilter.h
deleted file mode 100644
index 73bdee8..0000000
--- a/pc/srtpfilter.h
+++ /dev/null
@@ -1,19 +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 PC_SRTPFILTER_H_
-#define PC_SRTPFILTER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/srtp_filter.h"
-
-#endif // PC_SRTPFILTER_H_
diff --git a/pc/srtpsession.h b/pc/srtpsession.h
deleted file mode 100644
index 975ca8b..0000000
--- a/pc/srtpsession.h
+++ /dev/null
@@ -1,19 +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 PC_SRTPSESSION_H_
-#define PC_SRTPSESSION_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/srtp_session.h"
-
-#endif // PC_SRTPSESSION_H_
diff --git a/pc/srtptestutil.h b/pc/srtptestutil.h
deleted file mode 100644
index 8c5917f..0000000
--- a/pc/srtptestutil.h
+++ /dev/null
@@ -1,19 +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 PC_SRTPTESTUTIL_H_
-#define PC_SRTPTESTUTIL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/srtp_test_util.h"
-
-#endif // PC_SRTPTESTUTIL_H_
diff --git a/pc/srtptransport.h b/pc/srtptransport.h
deleted file mode 100644
index a45dba1..0000000
--- a/pc/srtptransport.h
+++ /dev/null
@@ -1,19 +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 PC_SRTPTRANSPORT_H_
-#define PC_SRTPTRANSPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/srtp_transport.h"
-
-#endif // PC_SRTPTRANSPORT_H_
diff --git a/pc/statscollector.h b/pc/statscollector.h
deleted file mode 100644
index 0a72ac7..0000000
--- a/pc/statscollector.h
+++ /dev/null
@@ -1,19 +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 PC_STATSCOLLECTOR_H_
-#define PC_STATSCOLLECTOR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/stats_collector.h"
-
-#endif // PC_STATSCOLLECTOR_H_
diff --git a/pc/streamcollection.h b/pc/streamcollection.h
deleted file mode 100644
index 2e63c14..0000000
--- a/pc/streamcollection.h
+++ /dev/null
@@ -1,19 +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 PC_STREAMCOLLECTION_H_
-#define PC_STREAMCOLLECTION_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/stream_collection.h"
-
-#endif // PC_STREAMCOLLECTION_H_
diff --git a/pc/test/androidtestinitializer.h b/pc/test/androidtestinitializer.h
deleted file mode 100644
index 723dde7..0000000
--- a/pc/test/androidtestinitializer.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_ANDROIDTESTINITIALIZER_H_
-#define PC_TEST_ANDROIDTESTINITIALIZER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/android_test_initializer.h"
-
-#endif // PC_TEST_ANDROIDTESTINITIALIZER_H_
diff --git a/pc/test/fakeaudiocapturemodule.h b/pc/test/fakeaudiocapturemodule.h
deleted file mode 100644
index b07038f..0000000
--- a/pc/test/fakeaudiocapturemodule.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_FAKEAUDIOCAPTUREMODULE_H_
-#define PC_TEST_FAKEAUDIOCAPTUREMODULE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/fake_audio_capture_module.h"
-
-#endif // PC_TEST_FAKEAUDIOCAPTUREMODULE_H_
diff --git a/pc/test/fakedatachannelprovider.h b/pc/test/fakedatachannelprovider.h
deleted file mode 100644
index c686340..0000000
--- a/pc/test/fakedatachannelprovider.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_FAKEDATACHANNELPROVIDER_H_
-#define PC_TEST_FAKEDATACHANNELPROVIDER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/fake_data_channel_provider.h"
-
-#endif // PC_TEST_FAKEDATACHANNELPROVIDER_H_
diff --git a/pc/test/fakepeerconnectionbase.h b/pc/test/fakepeerconnectionbase.h
deleted file mode 100644
index e57fd46..0000000
--- a/pc/test/fakepeerconnectionbase.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_FAKEPEERCONNECTIONBASE_H_
-#define PC_TEST_FAKEPEERCONNECTIONBASE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/fake_peer_connection_base.h"
-
-#endif // PC_TEST_FAKEPEERCONNECTIONBASE_H_
diff --git a/pc/test/fakepeerconnectionforstats.h b/pc/test/fakepeerconnectionforstats.h
deleted file mode 100644
index f377746..0000000
--- a/pc/test/fakepeerconnectionforstats.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_FAKEPEERCONNECTIONFORSTATS_H_
-#define PC_TEST_FAKEPEERCONNECTIONFORSTATS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/fake_peer_connection_for_stats.h"
-
-#endif // PC_TEST_FAKEPEERCONNECTIONFORSTATS_H_
diff --git a/pc/test/fakeperiodicvideosource.h b/pc/test/fakeperiodicvideosource.h
deleted file mode 100644
index d5584d2..0000000
--- a/pc/test/fakeperiodicvideosource.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_FAKEPERIODICVIDEOSOURCE_H_
-#define PC_TEST_FAKEPERIODICVIDEOSOURCE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/fake_periodic_video_source.h"
-
-#endif // PC_TEST_FAKEPERIODICVIDEOSOURCE_H_
diff --git a/pc/test/fakeperiodicvideotracksource.h b/pc/test/fakeperiodicvideotracksource.h
deleted file mode 100644
index c678f03..0000000
--- a/pc/test/fakeperiodicvideotracksource.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_FAKEPERIODICVIDEOTRACKSOURCE_H_
-#define PC_TEST_FAKEPERIODICVIDEOTRACKSOURCE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/fake_periodic_video_track_source.h"
-
-#endif // PC_TEST_FAKEPERIODICVIDEOTRACKSOURCE_H_
diff --git a/pc/test/fakertccertificategenerator.h b/pc/test/fakertccertificategenerator.h
deleted file mode 100644
index 16f59bf..0000000
--- a/pc/test/fakertccertificategenerator.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_
-#define PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/fake_rtc_certificate_generator.h"
-
-#endif // PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_
diff --git a/pc/test/fakesctptransport.h b/pc/test/fakesctptransport.h
deleted file mode 100644
index 03efda9..0000000
--- a/pc/test/fakesctptransport.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_FAKESCTPTRANSPORT_H_
-#define PC_TEST_FAKESCTPTRANSPORT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/fake_sctp_transport.h"
-
-#endif // PC_TEST_FAKESCTPTRANSPORT_H_
diff --git a/pc/test/fakevideotrackrenderer.h b/pc/test/fakevideotrackrenderer.h
deleted file mode 100644
index 017f941..0000000
--- a/pc/test/fakevideotrackrenderer.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_FAKEVIDEOTRACKRENDERER_H_
-#define PC_TEST_FAKEVIDEOTRACKRENDERER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/fake_video_track_renderer.h"
-
-#endif // PC_TEST_FAKEVIDEOTRACKRENDERER_H_
diff --git a/pc/test/fakevideotracksource.h b/pc/test/fakevideotracksource.h
deleted file mode 100644
index ed551e1..0000000
--- a/pc/test/fakevideotracksource.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_FAKEVIDEOTRACKSOURCE_H_
-#define PC_TEST_FAKEVIDEOTRACKSOURCE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/fake_video_track_source.h"
-
-#endif // PC_TEST_FAKEVIDEOTRACKSOURCE_H_
diff --git a/pc/test/framegeneratorcapturervideotracksource.h b/pc/test/framegeneratorcapturervideotracksource.h
deleted file mode 100644
index 8f47a4d..0000000
--- a/pc/test/framegeneratorcapturervideotracksource.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_FRAMEGENERATORCAPTURERVIDEOTRACKSOURCE_H_
-#define PC_TEST_FRAMEGENERATORCAPTURERVIDEOTRACKSOURCE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/frame_generator_capturer_video_track_source.h"
-
-#endif // PC_TEST_FRAMEGENERATORCAPTURERVIDEOTRACKSOURCE_H_
diff --git a/pc/test/mock_channelinterface.h b/pc/test/mock_channelinterface.h
deleted file mode 100644
index 09d31ad..0000000
--- a/pc/test/mock_channelinterface.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_MOCK_CHANNELINTERFACE_H_
-#define PC_TEST_MOCK_CHANNELINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/mock_channel_interface.h"
-
-#endif // PC_TEST_MOCK_CHANNELINTERFACE_H_
diff --git a/pc/test/mock_datachannel.h b/pc/test/mock_datachannel.h
deleted file mode 100644
index cec3092..0000000
--- a/pc/test/mock_datachannel.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_MOCK_DATACHANNEL_H_
-#define PC_TEST_MOCK_DATACHANNEL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/mock_data_channel.h"
-
-#endif // PC_TEST_MOCK_DATACHANNEL_H_
diff --git a/pc/test/mock_rtpreceiverinternal.h b/pc/test/mock_rtpreceiverinternal.h
deleted file mode 100644
index 5a8cf9a..0000000
--- a/pc/test/mock_rtpreceiverinternal.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_MOCK_RTPRECEIVERINTERNAL_H_
-#define PC_TEST_MOCK_RTPRECEIVERINTERNAL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/mock_rtp_receiver_internal.h"
-
-#endif // PC_TEST_MOCK_RTPRECEIVERINTERNAL_H_
diff --git a/pc/test/mock_rtpsenderinternal.h b/pc/test/mock_rtpsenderinternal.h
deleted file mode 100644
index 8a71d1b..0000000
--- a/pc/test/mock_rtpsenderinternal.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_MOCK_RTPSENDERINTERNAL_H_
-#define PC_TEST_MOCK_RTPSENDERINTERNAL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/mock_rtp_sender_internal.h"
-
-#endif // PC_TEST_MOCK_RTPSENDERINTERNAL_H_
diff --git a/pc/test/mockpeerconnectionobservers.h b/pc/test/mockpeerconnectionobservers.h
deleted file mode 100644
index 331220d..0000000
--- a/pc/test/mockpeerconnectionobservers.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_
-#define PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/mock_peer_connection_observers.h"
-
-#endif // PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_
diff --git a/pc/test/peerconnectiontestwrapper.h b/pc/test/peerconnectiontestwrapper.h
deleted file mode 100644
index 0f8deed..0000000
--- a/pc/test/peerconnectiontestwrapper.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
-#define PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/peer_connection_test_wrapper.h"
-
-#endif // PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
diff --git a/pc/test/rtcstatsobtainer.h b/pc/test/rtcstatsobtainer.h
deleted file mode 100644
index dc589eb..0000000
--- a/pc/test/rtcstatsobtainer.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_RTCSTATSOBTAINER_H_
-#define PC_TEST_RTCSTATSOBTAINER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/rtc_stats_obtainer.h"
-
-#endif // PC_TEST_RTCSTATSOBTAINER_H_
diff --git a/pc/test/testsdpstrings.h b/pc/test/testsdpstrings.h
deleted file mode 100644
index 452fd3c..0000000
--- a/pc/test/testsdpstrings.h
+++ /dev/null
@@ -1,19 +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 PC_TEST_TESTSDPSTRINGS_H_
-#define PC_TEST_TESTSDPSTRINGS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/test/test_sdp_strings.h"
-
-#endif // PC_TEST_TESTSDPSTRINGS_H_
diff --git a/pc/trackmediainfomap.h b/pc/trackmediainfomap.h
deleted file mode 100644
index 7d36a96..0000000
--- a/pc/trackmediainfomap.h
+++ /dev/null
@@ -1,19 +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 PC_TRACKMEDIAINFOMAP_H_
-#define PC_TRACKMEDIAINFOMAP_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/track_media_info_map.h"
-
-#endif // PC_TRACKMEDIAINFOMAP_H_
diff --git a/pc/transportstats.h b/pc/transportstats.h
deleted file mode 100644
index 69c6a6e..0000000
--- a/pc/transportstats.h
+++ /dev/null
@@ -1,19 +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 PC_TRANSPORTSTATS_H_
-#define PC_TRANSPORTSTATS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/transport_stats.h"
-
-#endif // PC_TRANSPORTSTATS_H_
diff --git a/pc/videocapturertracksource.h b/pc/videocapturertracksource.h
deleted file mode 100644
index cd13b82..0000000
--- a/pc/videocapturertracksource.h
+++ /dev/null
@@ -1,19 +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 PC_VIDEOCAPTURERTRACKSOURCE_H_
-#define PC_VIDEOCAPTURERTRACKSOURCE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/video_capturer_track_source.h"
-
-#endif // PC_VIDEOCAPTURERTRACKSOURCE_H_
diff --git a/pc/videotrack.h b/pc/videotrack.h
deleted file mode 100644
index adbbda5..0000000
--- a/pc/videotrack.h
+++ /dev/null
@@ -1,19 +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 PC_VIDEOTRACK_H_
-#define PC_VIDEOTRACK_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/video_track.h"
-
-#endif // PC_VIDEOTRACK_H_
diff --git a/pc/videotracksource.h b/pc/videotracksource.h
deleted file mode 100644
index 8f83fff..0000000
--- a/pc/videotracksource.h
+++ /dev/null
@@ -1,19 +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 PC_VIDEOTRACKSOURCE_H_
-#define PC_VIDEOTRACKSOURCE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/video_track_source.h"
-
-#endif // PC_VIDEOTRACKSOURCE_H_
diff --git a/pc/webrtcsdp.h b/pc/webrtcsdp.h
deleted file mode 100644
index 2a0e5ec..0000000
--- a/pc/webrtcsdp.h
+++ /dev/null
@@ -1,19 +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 PC_WEBRTCSDP_H_
-#define PC_WEBRTCSDP_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/webrtc_sdp.h"
-
-#endif // PC_WEBRTCSDP_H_
diff --git a/pc/webrtcsessiondescriptionfactory.h b/pc/webrtcsessiondescriptionfactory.h
deleted file mode 100644
index 94821b7..0000000
--- a/pc/webrtcsessiondescriptionfactory.h
+++ /dev/null
@@ -1,19 +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 PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
-#define PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "pc/webrtc_session_description_factory.h"
-
-#endif // PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 7d25f1f..a47e6d2 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -93,22 +93,16 @@
"bind.h",
"bit_buffer.cc",
"bit_buffer.h",
- "bitbuffer.h",
"bitrate_allocation_strategy.cc",
"bitrate_allocation_strategy.h",
- "bitrateallocationstrategy.h",
"buffer.h",
"buffer_queue.cc",
"buffer_queue.h",
- "bufferqueue.h",
"byte_buffer.cc",
"byte_buffer.h",
"byte_order.h",
- "bytebuffer.h",
- "byteorder.h",
"copy_on_write_buffer.cc",
"copy_on_write_buffer.h",
- "copyonwritebuffer.h",
"event_tracer.cc",
"event_tracer.h",
"file.cc",
@@ -127,7 +121,6 @@
"numerics/sample_counter.cc",
"numerics/sample_counter.h",
"one_time_event.h",
- "onetimeevent.h",
"platform_file.cc",
"platform_file.h",
"race_checker.cc",
@@ -138,12 +131,10 @@
"rate_statistics.h",
"rate_tracker.cc",
"rate_tracker.h",
- "ratetracker.h",
"swap_queue.h",
"template_util.h",
"timestamp_aligner.cc",
"timestamp_aligner.h",
- "timestampaligner.h",
"trace_event.h",
"zero_memory.cc",
"zero_memory.h",
@@ -194,7 +185,6 @@
sources = [
"arraysize.h",
"constructor_magic.h",
- "constructormagic.h",
"format_macros.h",
"stringize_macros.h",
"thread_annotations.h",
@@ -217,9 +207,6 @@
"ref_count.h",
"ref_counted_object.h",
"ref_counter.h",
- "refcount.h",
- "refcountedobject.h",
- "refcounter.h",
]
deps = [
":atomicops",
@@ -231,7 +218,6 @@
sources = [
"critical_section.cc",
"critical_section.h",
- "criticalsection.h",
]
deps = [
":atomicops",
@@ -348,7 +334,6 @@
rtc_source_set("atomicops") {
sources = [
"atomic_ops.h",
- "atomicops.h",
]
}
@@ -425,7 +410,6 @@
sources = [
"time_utils.cc",
"time_utils.h",
- "timeutils.h",
]
deps = [
":checks",
@@ -442,10 +426,8 @@
"string_to_number.h",
"string_utils.cc",
"string_utils.h",
- "stringencode.h",
"strings/string_builder.cc",
"strings/string_builder.h",
- "stringutils.h",
]
deps = [
":checks",
@@ -887,33 +869,22 @@
"async_tcp_socket.h",
"async_udp_socket.cc",
"async_udp_socket.h",
- "asyncinvoker-inl.h",
- "asyncinvoker.h",
- "asyncpacketsocket.h",
- "asyncresolverinterface.h",
- "asyncsocket.h",
- "asynctcpsocket.h",
- "asyncudpsocket.h",
"crc32.cc",
"crc32.h",
"crypt_string.cc",
"crypt_string.h",
- "cryptstring.h",
"data_rate_limiter.cc",
"data_rate_limiter.h",
"dscp.h",
"file_rotating_stream.cc",
"file_rotating_stream.h",
- "filerotatingstream.h",
"gunit_prod.h",
"helpers.cc",
"helpers.h",
"http_common.cc",
"http_common.h",
- "httpcommon.h",
"ip_address.cc",
"ip_address.h",
- "ipaddress.h",
"keep_ref_until_done.h",
"key_derivation.cc",
"key_derivation.h",
@@ -924,26 +895,18 @@
"message_handler.h",
"message_queue.cc",
"message_queue.h",
- "messagedigest.h",
- "messagehandler.h",
- "messagequeue.h",
"net_helper.cc",
"net_helper.h",
"net_helpers.cc",
"net_helpers.h",
- "nethelper.h",
- "nethelpers.h",
"network.cc",
"network.h",
"network_constants.h",
"network_monitor.cc",
"network_monitor.h",
"network_route.h",
- "networkmonitor.h",
- "networkroute.h",
"null_socket_server.cc",
"null_socket_server.h",
- "nullsocketserver.h",
"openssl.h",
"openssl_adapter.cc",
"openssl_adapter.h",
@@ -961,30 +924,17 @@
"openssl_stream_adapter.h",
"openssl_utility.cc",
"openssl_utility.h",
- "openssladapter.h",
- "opensslcertificate.h",
- "openssldigest.h",
- "opensslidentity.h",
- "opensslsessioncache.h",
- "opensslstreamadapter.h",
- "opensslutility.h",
"physical_socket_server.cc",
"physical_socket_server.h",
- "physicalsocketserver.h",
"proxy_info.cc",
"proxy_info.h",
- "proxyinfo.h",
"rtc_certificate.cc",
"rtc_certificate.h",
"rtc_certificate_generator.cc",
"rtc_certificate_generator.h",
- "rtccertificate.h",
- "rtccertificategenerator.h",
"signal_thread.cc",
"signal_thread.h",
- "signalthread.h",
"sigslot_repeater.h",
- "sigslotrepeater.h",
"socket.cc",
"socket.h",
"socket_adapters.cc",
@@ -995,11 +945,6 @@
"socket_address_pair.h",
"socket_factory.h",
"socket_server.h",
- "socketadapters.h",
- "socketaddress.h",
- "socketaddresspair.h",
- "socketfactory.h",
- "socketserver.h",
"ssl_adapter.cc",
"ssl_adapter.h",
"ssl_certificate.cc",
@@ -1010,11 +955,6 @@
"ssl_identity.h",
"ssl_stream_adapter.cc",
"ssl_stream_adapter.h",
- "ssladapter.h",
- "sslcertificate.h",
- "sslfingerprint.h",
- "sslidentity.h",
- "sslstreamadapter.h",
"stream.cc",
"stream.h",
"thread.cc",
@@ -1031,25 +971,17 @@
"callback.h",
"log_sinks.cc",
"log_sinks.h",
- "logsinks.h",
"numerics/math_utils.h",
- "numerics/mathutils.h",
"rolling_accumulator.h",
- "rollingaccumulator.h",
"ssl_roots.h",
- "sslroots.h",
]
if (is_win) {
- sources += [
- "win32_socket_init.h",
- "win32socketinit.h",
- ]
+ sources += [ "win32_socket_init.h" ]
if (current_os != "winuwp") {
sources += [
"win32_socket_server.cc",
"win32_socket_server.h",
- "win32socketserver.h",
]
}
}
@@ -1063,7 +995,6 @@
if (is_android) {
sources += [
- "ifaddrs-android.h",
"ifaddrs_android.cc",
"ifaddrs_android.h",
]
@@ -1101,7 +1032,6 @@
sources += [
"mac_utils.cc",
"mac_utils.h",
- "macutils.h",
]
}
@@ -1111,7 +1041,6 @@
"win32.h",
"win32_window.cc",
"win32_window.h",
- "win32window.h",
]
libs += [
@@ -1165,7 +1094,6 @@
sources = [
"test_client.cc",
"test_client.h",
- "testclient.h",
]
deps = [
":criticalsection",
@@ -1189,12 +1117,8 @@
"fake_network.h",
"fake_ssl_identity.cc",
"fake_ssl_identity.h",
- "fakeclock.h",
- "fakenetwork.h",
- "fakesslidentity.h",
"firewall_socket_server.cc",
"firewall_socket_server.h",
- "firewallsocketserver.h",
"memory_stream.cc",
"memory_stream.h",
"memory_usage.cc",
@@ -1205,33 +1129,22 @@
"nat_socket_factory.h",
"nat_types.cc",
"nat_types.h",
- "natserver.h",
- "natsocketfactory.h",
- "nattypes.h",
"proxy_server.cc",
"proxy_server.h",
- "proxyserver.h",
"server_socket_adapters.cc",
"server_socket_adapters.h",
"sigslot_tester.h",
- "sigslottester.h",
"sigslottester.h.pump",
"socket_stream.cc",
"socket_stream.h",
- "socketstream.h",
"test_base64.h",
"test_certificate_verifier.h",
"test_echo_server.cc",
"test_echo_server.h",
"test_utils.cc",
"test_utils.h",
- "testbase64.h",
- "testcertificateverifier.h",
- "testechoserver.h",
- "testutils.h",
"virtual_socket_server.cc",
"virtual_socket_server.h",
- "virtualsocketserver.h",
]
deps = [
":checks",
diff --git a/rtc_base/asyncinvoker-inl.h b/rtc_base/asyncinvoker-inl.h
deleted file mode 100644
index c631bf9..0000000
--- a/rtc_base/asyncinvoker-inl.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_ASYNCINVOKER_INL_H_
-#define RTC_BASE_ASYNCINVOKER_INL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/async_invoker_inl.h"
-
-#endif // RTC_BASE_ASYNCINVOKER_INL_H_
diff --git a/rtc_base/asyncinvoker.h b/rtc_base/asyncinvoker.h
deleted file mode 100644
index 1a465ed..0000000
--- a/rtc_base/asyncinvoker.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_ASYNCINVOKER_H_
-#define RTC_BASE_ASYNCINVOKER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/async_invoker.h"
-
-#endif // RTC_BASE_ASYNCINVOKER_H_
diff --git a/rtc_base/asyncpacketsocket.h b/rtc_base/asyncpacketsocket.h
deleted file mode 100644
index 3d83174..0000000
--- a/rtc_base/asyncpacketsocket.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_ASYNCPACKETSOCKET_H_
-#define RTC_BASE_ASYNCPACKETSOCKET_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/async_packet_socket.h"
-
-#endif // RTC_BASE_ASYNCPACKETSOCKET_H_
diff --git a/rtc_base/asyncresolverinterface.h b/rtc_base/asyncresolverinterface.h
deleted file mode 100644
index 7398efb..0000000
--- a/rtc_base/asyncresolverinterface.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_ASYNCRESOLVERINTERFACE_H_
-#define RTC_BASE_ASYNCRESOLVERINTERFACE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/async_resolver_interface.h"
-
-#endif // RTC_BASE_ASYNCRESOLVERINTERFACE_H_
diff --git a/rtc_base/asyncsocket.h b/rtc_base/asyncsocket.h
deleted file mode 100644
index 6c60ab2..0000000
--- a/rtc_base/asyncsocket.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_ASYNCSOCKET_H_
-#define RTC_BASE_ASYNCSOCKET_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/async_socket.h"
-
-#endif // RTC_BASE_ASYNCSOCKET_H_
diff --git a/rtc_base/asynctcpsocket.h b/rtc_base/asynctcpsocket.h
deleted file mode 100644
index ccc343b..0000000
--- a/rtc_base/asynctcpsocket.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_ASYNCTCPSOCKET_H_
-#define RTC_BASE_ASYNCTCPSOCKET_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/async_tcp_socket.h"
-
-#endif // RTC_BASE_ASYNCTCPSOCKET_H_
diff --git a/rtc_base/asyncudpsocket.h b/rtc_base/asyncudpsocket.h
deleted file mode 100644
index a901f87..0000000
--- a/rtc_base/asyncudpsocket.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_ASYNCUDPSOCKET_H_
-#define RTC_BASE_ASYNCUDPSOCKET_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/async_udp_socket.h"
-
-#endif // RTC_BASE_ASYNCUDPSOCKET_H_
diff --git a/rtc_base/atomicops.h b/rtc_base/atomicops.h
deleted file mode 100644
index 3c6a56d..0000000
--- a/rtc_base/atomicops.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_ATOMICOPS_H_
-#define RTC_BASE_ATOMICOPS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/atomic_ops.h"
-
-#endif // RTC_BASE_ATOMICOPS_H_
diff --git a/rtc_base/bitbuffer.h b/rtc_base/bitbuffer.h
deleted file mode 100644
index bef05e7..0000000
--- a/rtc_base/bitbuffer.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_BITBUFFER_H_
-#define RTC_BASE_BITBUFFER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/bit_buffer.h"
-
-#endif // RTC_BASE_BITBUFFER_H_
diff --git a/rtc_base/bitrateallocationstrategy.h b/rtc_base/bitrateallocationstrategy.h
deleted file mode 100644
index f378637..0000000
--- a/rtc_base/bitrateallocationstrategy.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_
-#define RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/bitrate_allocation_strategy.h"
-
-#endif // RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_
diff --git a/rtc_base/bufferqueue.h b/rtc_base/bufferqueue.h
deleted file mode 100644
index f51d036..0000000
--- a/rtc_base/bufferqueue.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_BUFFERQUEUE_H_
-#define RTC_BASE_BUFFERQUEUE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/buffer_queue.h"
-
-#endif // RTC_BASE_BUFFERQUEUE_H_
diff --git a/rtc_base/bytebuffer.h b/rtc_base/bytebuffer.h
deleted file mode 100644
index 4d51dee..0000000
--- a/rtc_base/bytebuffer.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_BYTEBUFFER_H_
-#define RTC_BASE_BYTEBUFFER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/byte_buffer.h"
-
-#endif // RTC_BASE_BYTEBUFFER_H_
diff --git a/rtc_base/byteorder.h b/rtc_base/byteorder.h
deleted file mode 100644
index ab756be..0000000
--- a/rtc_base/byteorder.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_BYTEORDER_H_
-#define RTC_BASE_BYTEORDER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/byte_order.h"
-
-#endif // RTC_BASE_BYTEORDER_H_
diff --git a/rtc_base/constructormagic.h b/rtc_base/constructormagic.h
deleted file mode 100644
index 427ffb3..0000000
--- a/rtc_base/constructormagic.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_CONSTRUCTORMAGIC_H_
-#define RTC_BASE_CONSTRUCTORMAGIC_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/constructor_magic.h"
-
-#endif // RTC_BASE_CONSTRUCTORMAGIC_H_
diff --git a/rtc_base/copyonwritebuffer.h b/rtc_base/copyonwritebuffer.h
deleted file mode 100644
index c2ad15b..0000000
--- a/rtc_base/copyonwritebuffer.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_COPYONWRITEBUFFER_H_
-#define RTC_BASE_COPYONWRITEBUFFER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/copy_on_write_buffer.h"
-
-#endif // RTC_BASE_COPYONWRITEBUFFER_H_
diff --git a/rtc_base/criticalsection.h b/rtc_base/criticalsection.h
deleted file mode 100644
index 1b73fc2..0000000
--- a/rtc_base/criticalsection.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_CRITICALSECTION_H_
-#define RTC_BASE_CRITICALSECTION_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/critical_section.h"
-
-#endif // RTC_BASE_CRITICALSECTION_H_
diff --git a/rtc_base/cryptstring.h b/rtc_base/cryptstring.h
deleted file mode 100644
index 8816fbc..0000000
--- a/rtc_base/cryptstring.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_CRYPTSTRING_H_
-#define RTC_BASE_CRYPTSTRING_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/crypt_string.h"
-
-#endif // RTC_BASE_CRYPTSTRING_H_
diff --git a/rtc_base/fakeclock.h b/rtc_base/fakeclock.h
deleted file mode 100644
index 97f7058..0000000
--- a/rtc_base/fakeclock.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_FAKECLOCK_H_
-#define RTC_BASE_FAKECLOCK_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/fake_clock.h"
-
-#endif // RTC_BASE_FAKECLOCK_H_
diff --git a/rtc_base/fakenetwork.h b/rtc_base/fakenetwork.h
deleted file mode 100644
index 350c1f2..0000000
--- a/rtc_base/fakenetwork.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_FAKENETWORK_H_
-#define RTC_BASE_FAKENETWORK_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/fake_network.h"
-
-#endif // RTC_BASE_FAKENETWORK_H_
diff --git a/rtc_base/fakesslidentity.h b/rtc_base/fakesslidentity.h
deleted file mode 100644
index 43dd76c..0000000
--- a/rtc_base/fakesslidentity.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_FAKESSLIDENTITY_H_
-#define RTC_BASE_FAKESSLIDENTITY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/fake_ssl_identity.h"
-
-#endif // RTC_BASE_FAKESSLIDENTITY_H_
diff --git a/rtc_base/filerotatingstream.h b/rtc_base/filerotatingstream.h
deleted file mode 100644
index eaff670..0000000
--- a/rtc_base/filerotatingstream.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_FILEROTATINGSTREAM_H_
-#define RTC_BASE_FILEROTATINGSTREAM_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/file_rotating_stream.h"
-
-#endif // RTC_BASE_FILEROTATINGSTREAM_H_
diff --git a/rtc_base/firewallsocketserver.h b/rtc_base/firewallsocketserver.h
deleted file mode 100644
index ab31968..0000000
--- a/rtc_base/firewallsocketserver.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_FIREWALLSOCKETSERVER_H_
-#define RTC_BASE_FIREWALLSOCKETSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/firewall_socket_server.h"
-
-#endif // RTC_BASE_FIREWALLSOCKETSERVER_H_
diff --git a/rtc_base/httpcommon.h b/rtc_base/httpcommon.h
deleted file mode 100644
index d30ab3c..0000000
--- a/rtc_base/httpcommon.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_HTTPCOMMON_H_
-#define RTC_BASE_HTTPCOMMON_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/http_common.h"
-
-#endif // RTC_BASE_HTTPCOMMON_H_
diff --git a/rtc_base/ifaddrs-android.h b/rtc_base/ifaddrs-android.h
deleted file mode 100644
index b3d28e2..0000000
--- a/rtc_base/ifaddrs-android.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_IFADDRS_ANDROID_H_
-#define RTC_BASE_IFADDRS_ANDROID_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/ifaddrs_android.h"
-
-#endif // RTC_BASE_IFADDRS_ANDROID_H_
diff --git a/rtc_base/ipaddress.h b/rtc_base/ipaddress.h
deleted file mode 100644
index 258613c..0000000
--- a/rtc_base/ipaddress.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_IPADDRESS_H_
-#define RTC_BASE_IPADDRESS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/ip_address.h"
-
-#endif // RTC_BASE_IPADDRESS_H_
diff --git a/rtc_base/logsinks.h b/rtc_base/logsinks.h
deleted file mode 100644
index 01f3d50..0000000
--- a/rtc_base/logsinks.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_LOGSINKS_H_
-#define RTC_BASE_LOGSINKS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/log_sinks.h"
-
-#endif // RTC_BASE_LOGSINKS_H_
diff --git a/rtc_base/macutils.h b/rtc_base/macutils.h
deleted file mode 100644
index a141833..0000000
--- a/rtc_base/macutils.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_MACUTILS_H_
-#define RTC_BASE_MACUTILS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/mac_utils.h"
-
-#endif // RTC_BASE_MACUTILS_H_
diff --git a/rtc_base/messagedigest.h b/rtc_base/messagedigest.h
deleted file mode 100644
index 0b14045..0000000
--- a/rtc_base/messagedigest.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_MESSAGEDIGEST_H_
-#define RTC_BASE_MESSAGEDIGEST_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/message_digest.h"
-
-#endif // RTC_BASE_MESSAGEDIGEST_H_
diff --git a/rtc_base/messagehandler.h b/rtc_base/messagehandler.h
deleted file mode 100644
index 5d5098d..0000000
--- a/rtc_base/messagehandler.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_MESSAGEHANDLER_H_
-#define RTC_BASE_MESSAGEHANDLER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/message_handler.h"
-
-#endif // RTC_BASE_MESSAGEHANDLER_H_
diff --git a/rtc_base/messagequeue.h b/rtc_base/messagequeue.h
deleted file mode 100644
index 77a989e..0000000
--- a/rtc_base/messagequeue.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_MESSAGEQUEUE_H_
-#define RTC_BASE_MESSAGEQUEUE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/message_queue.h"
-
-#endif // RTC_BASE_MESSAGEQUEUE_H_
diff --git a/rtc_base/natserver.h b/rtc_base/natserver.h
deleted file mode 100644
index 303b0d7..0000000
--- a/rtc_base/natserver.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_NATSERVER_H_
-#define RTC_BASE_NATSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/nat_server.h"
-
-#endif // RTC_BASE_NATSERVER_H_
diff --git a/rtc_base/natsocketfactory.h b/rtc_base/natsocketfactory.h
deleted file mode 100644
index 3235167..0000000
--- a/rtc_base/natsocketfactory.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_NATSOCKETFACTORY_H_
-#define RTC_BASE_NATSOCKETFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/nat_socket_factory.h"
-
-#endif // RTC_BASE_NATSOCKETFACTORY_H_
diff --git a/rtc_base/nattypes.h b/rtc_base/nattypes.h
deleted file mode 100644
index dd6d5ce..0000000
--- a/rtc_base/nattypes.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_NATTYPES_H_
-#define RTC_BASE_NATTYPES_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/nat_types.h"
-
-#endif // RTC_BASE_NATTYPES_H_
diff --git a/rtc_base/nethelper.h b/rtc_base/nethelper.h
deleted file mode 100644
index 276b3c7..0000000
--- a/rtc_base/nethelper.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_NETHELPER_H_
-#define RTC_BASE_NETHELPER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/net_helper.h"
-
-#endif // RTC_BASE_NETHELPER_H_
diff --git a/rtc_base/nethelpers.h b/rtc_base/nethelpers.h
deleted file mode 100644
index f28d4cc..0000000
--- a/rtc_base/nethelpers.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_NETHELPERS_H_
-#define RTC_BASE_NETHELPERS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/net_helpers.h"
-
-#endif // RTC_BASE_NETHELPERS_H_
diff --git a/rtc_base/networkmonitor.h b/rtc_base/networkmonitor.h
deleted file mode 100644
index 6459e78..0000000
--- a/rtc_base/networkmonitor.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_NETWORKMONITOR_H_
-#define RTC_BASE_NETWORKMONITOR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/network_monitor.h"
-
-#endif // RTC_BASE_NETWORKMONITOR_H_
diff --git a/rtc_base/networkroute.h b/rtc_base/networkroute.h
deleted file mode 100644
index 37a8942..0000000
--- a/rtc_base/networkroute.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_NETWORKROUTE_H_
-#define RTC_BASE_NETWORKROUTE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/network_route.h"
-
-#endif // RTC_BASE_NETWORKROUTE_H_
diff --git a/rtc_base/nullsocketserver.h b/rtc_base/nullsocketserver.h
deleted file mode 100644
index 2340e68..0000000
--- a/rtc_base/nullsocketserver.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_NULLSOCKETSERVER_H_
-#define RTC_BASE_NULLSOCKETSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/null_socket_server.h"
-
-#endif // RTC_BASE_NULLSOCKETSERVER_H_
diff --git a/rtc_base/numerics/mathutils.h b/rtc_base/numerics/mathutils.h
deleted file mode 100644
index 9ee15d2..0000000
--- a/rtc_base/numerics/mathutils.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_NUMERICS_MATHUTILS_H_
-#define RTC_BASE_NUMERICS_MATHUTILS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/numerics/math_utils.h"
-
-#endif // RTC_BASE_NUMERICS_MATHUTILS_H_
diff --git a/rtc_base/onetimeevent.h b/rtc_base/onetimeevent.h
deleted file mode 100644
index 6c32f5e..0000000
--- a/rtc_base/onetimeevent.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_ONETIMEEVENT_H_
-#define RTC_BASE_ONETIMEEVENT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/one_time_event.h"
-
-#endif // RTC_BASE_ONETIMEEVENT_H_
diff --git a/rtc_base/openssladapter.h b/rtc_base/openssladapter.h
deleted file mode 100644
index 17021ce..0000000
--- a/rtc_base/openssladapter.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_OPENSSLADAPTER_H_
-#define RTC_BASE_OPENSSLADAPTER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/openssl_adapter.h"
-
-#endif // RTC_BASE_OPENSSLADAPTER_H_
diff --git a/rtc_base/opensslcertificate.h b/rtc_base/opensslcertificate.h
deleted file mode 100644
index daabf70..0000000
--- a/rtc_base/opensslcertificate.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_OPENSSLCERTIFICATE_H_
-#define RTC_BASE_OPENSSLCERTIFICATE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/openssl_certificate.h"
-
-#endif // RTC_BASE_OPENSSLCERTIFICATE_H_
diff --git a/rtc_base/openssldigest.h b/rtc_base/openssldigest.h
deleted file mode 100644
index eee65af..0000000
--- a/rtc_base/openssldigest.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_OPENSSLDIGEST_H_
-#define RTC_BASE_OPENSSLDIGEST_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/openssl_digest.h"
-
-#endif // RTC_BASE_OPENSSLDIGEST_H_
diff --git a/rtc_base/opensslidentity.h b/rtc_base/opensslidentity.h
deleted file mode 100644
index 7926f08..0000000
--- a/rtc_base/opensslidentity.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_OPENSSLIDENTITY_H_
-#define RTC_BASE_OPENSSLIDENTITY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/openssl_identity.h"
-
-#endif // RTC_BASE_OPENSSLIDENTITY_H_
diff --git a/rtc_base/opensslsessioncache.h b/rtc_base/opensslsessioncache.h
deleted file mode 100644
index 3446788..0000000
--- a/rtc_base/opensslsessioncache.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_OPENSSLSESSIONCACHE_H_
-#define RTC_BASE_OPENSSLSESSIONCACHE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/openssl_session_cache.h"
-
-#endif // RTC_BASE_OPENSSLSESSIONCACHE_H_
diff --git a/rtc_base/opensslstreamadapter.h b/rtc_base/opensslstreamadapter.h
deleted file mode 100644
index 94c5585..0000000
--- a/rtc_base/opensslstreamadapter.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_OPENSSLSTREAMADAPTER_H_
-#define RTC_BASE_OPENSSLSTREAMADAPTER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/openssl_stream_adapter.h"
-
-#endif // RTC_BASE_OPENSSLSTREAMADAPTER_H_
diff --git a/rtc_base/opensslutility.h b/rtc_base/opensslutility.h
deleted file mode 100644
index d19c931..0000000
--- a/rtc_base/opensslutility.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_OPENSSLUTILITY_H_
-#define RTC_BASE_OPENSSLUTILITY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/openssl_utility.h"
-
-#endif // RTC_BASE_OPENSSLUTILITY_H_
diff --git a/rtc_base/physicalsocketserver.h b/rtc_base/physicalsocketserver.h
deleted file mode 100644
index 95f2514..0000000
--- a/rtc_base/physicalsocketserver.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_PHYSICALSOCKETSERVER_H_
-#define RTC_BASE_PHYSICALSOCKETSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/physical_socket_server.h"
-
-#endif // RTC_BASE_PHYSICALSOCKETSERVER_H_
diff --git a/rtc_base/proxyinfo.h b/rtc_base/proxyinfo.h
deleted file mode 100644
index 93b85d1..0000000
--- a/rtc_base/proxyinfo.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_PROXYINFO_H_
-#define RTC_BASE_PROXYINFO_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/proxy_info.h"
-
-#endif // RTC_BASE_PROXYINFO_H_
diff --git a/rtc_base/proxyserver.h b/rtc_base/proxyserver.h
deleted file mode 100644
index 5b3ed47..0000000
--- a/rtc_base/proxyserver.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_PROXYSERVER_H_
-#define RTC_BASE_PROXYSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/proxy_server.h"
-
-#endif // RTC_BASE_PROXYSERVER_H_
diff --git a/rtc_base/ratetracker.h b/rtc_base/ratetracker.h
deleted file mode 100644
index 4d823a2..0000000
--- a/rtc_base/ratetracker.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_RATETRACKER_H_
-#define RTC_BASE_RATETRACKER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/rate_tracker.h"
-
-#endif // RTC_BASE_RATETRACKER_H_
diff --git a/rtc_base/refcount.h b/rtc_base/refcount.h
deleted file mode 100644
index 35c05e6..0000000
--- a/rtc_base/refcount.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_REFCOUNT_H_
-#define RTC_BASE_REFCOUNT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/ref_count.h"
-
-#endif // RTC_BASE_REFCOUNT_H_
diff --git a/rtc_base/refcountedobject.h b/rtc_base/refcountedobject.h
deleted file mode 100644
index 47e1a55..0000000
--- a/rtc_base/refcountedobject.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_REFCOUNTEDOBJECT_H_
-#define RTC_BASE_REFCOUNTEDOBJECT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/ref_counted_object.h"
-
-#endif // RTC_BASE_REFCOUNTEDOBJECT_H_
diff --git a/rtc_base/refcounter.h b/rtc_base/refcounter.h
deleted file mode 100644
index eb9bdd0..0000000
--- a/rtc_base/refcounter.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_REFCOUNTER_H_
-#define RTC_BASE_REFCOUNTER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/ref_counter.h"
-
-#endif // RTC_BASE_REFCOUNTER_H_
diff --git a/rtc_base/rollingaccumulator.h b/rtc_base/rollingaccumulator.h
deleted file mode 100644
index c05b206..0000000
--- a/rtc_base/rollingaccumulator.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_ROLLINGACCUMULATOR_H_
-#define RTC_BASE_ROLLINGACCUMULATOR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/rolling_accumulator.h"
-
-#endif // RTC_BASE_ROLLINGACCUMULATOR_H_
diff --git a/rtc_base/rtccertificate.h b/rtc_base/rtccertificate.h
deleted file mode 100644
index 2c624ff..0000000
--- a/rtc_base/rtccertificate.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_RTCCERTIFICATE_H_
-#define RTC_BASE_RTCCERTIFICATE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/rtc_certificate.h"
-
-#endif // RTC_BASE_RTCCERTIFICATE_H_
diff --git a/rtc_base/rtccertificategenerator.h b/rtc_base/rtccertificategenerator.h
deleted file mode 100644
index 214edd3..0000000
--- a/rtc_base/rtccertificategenerator.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_RTCCERTIFICATEGENERATOR_H_
-#define RTC_BASE_RTCCERTIFICATEGENERATOR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/rtc_certificate_generator.h"
-
-#endif // RTC_BASE_RTCCERTIFICATEGENERATOR_H_
diff --git a/rtc_base/signalthread.h b/rtc_base/signalthread.h
deleted file mode 100644
index bc3244b..0000000
--- a/rtc_base/signalthread.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SIGNALTHREAD_H_
-#define RTC_BASE_SIGNALTHREAD_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/signal_thread.h"
-
-#endif // RTC_BASE_SIGNALTHREAD_H_
diff --git a/rtc_base/sigslotrepeater.h b/rtc_base/sigslotrepeater.h
deleted file mode 100644
index 7835940..0000000
--- a/rtc_base/sigslotrepeater.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SIGSLOTREPEATER_H_
-#define RTC_BASE_SIGSLOTREPEATER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/sigslot_repeater.h"
-
-#endif // RTC_BASE_SIGSLOTREPEATER_H_
diff --git a/rtc_base/sigslottester.h b/rtc_base/sigslottester.h
deleted file mode 100644
index 0331361..0000000
--- a/rtc_base/sigslottester.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SIGSLOTTESTER_H_
-#define RTC_BASE_SIGSLOTTESTER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/sigslot_tester.h"
-
-#endif // RTC_BASE_SIGSLOTTESTER_H_
diff --git a/rtc_base/socketadapters.h b/rtc_base/socketadapters.h
deleted file mode 100644
index 4c5cd14..0000000
--- a/rtc_base/socketadapters.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SOCKETADAPTERS_H_
-#define RTC_BASE_SOCKETADAPTERS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/socket_adapters.h"
-
-#endif // RTC_BASE_SOCKETADAPTERS_H_
diff --git a/rtc_base/socketaddress.h b/rtc_base/socketaddress.h
deleted file mode 100644
index b4b0cc2..0000000
--- a/rtc_base/socketaddress.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SOCKETADDRESS_H_
-#define RTC_BASE_SOCKETADDRESS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/socket_address.h"
-
-#endif // RTC_BASE_SOCKETADDRESS_H_
diff --git a/rtc_base/socketaddresspair.h b/rtc_base/socketaddresspair.h
deleted file mode 100644
index 8b2875b..0000000
--- a/rtc_base/socketaddresspair.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SOCKETADDRESSPAIR_H_
-#define RTC_BASE_SOCKETADDRESSPAIR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/socket_address_pair.h"
-
-#endif // RTC_BASE_SOCKETADDRESSPAIR_H_
diff --git a/rtc_base/socketfactory.h b/rtc_base/socketfactory.h
deleted file mode 100644
index df2c203..0000000
--- a/rtc_base/socketfactory.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SOCKETFACTORY_H_
-#define RTC_BASE_SOCKETFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/socket_factory.h"
-
-#endif // RTC_BASE_SOCKETFACTORY_H_
diff --git a/rtc_base/socketserver.h b/rtc_base/socketserver.h
deleted file mode 100644
index 4b708ea..0000000
--- a/rtc_base/socketserver.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SOCKETSERVER_H_
-#define RTC_BASE_SOCKETSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/socket_server.h"
-
-#endif // RTC_BASE_SOCKETSERVER_H_
diff --git a/rtc_base/socketstream.h b/rtc_base/socketstream.h
deleted file mode 100644
index aeb0c14..0000000
--- a/rtc_base/socketstream.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SOCKETSTREAM_H_
-#define RTC_BASE_SOCKETSTREAM_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/socket_stream.h"
-
-#endif // RTC_BASE_SOCKETSTREAM_H_
diff --git a/rtc_base/ssladapter.h b/rtc_base/ssladapter.h
deleted file mode 100644
index 956a6c8..0000000
--- a/rtc_base/ssladapter.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SSLADAPTER_H_
-#define RTC_BASE_SSLADAPTER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/ssl_adapter.h"
-
-#endif // RTC_BASE_SSLADAPTER_H_
diff --git a/rtc_base/sslcertificate.h b/rtc_base/sslcertificate.h
deleted file mode 100644
index 15341af..0000000
--- a/rtc_base/sslcertificate.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SSLCERTIFICATE_H_
-#define RTC_BASE_SSLCERTIFICATE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/ssl_certificate.h"
-
-#endif // RTC_BASE_SSLCERTIFICATE_H_
diff --git a/rtc_base/sslfingerprint.h b/rtc_base/sslfingerprint.h
deleted file mode 100644
index 35251c7..0000000
--- a/rtc_base/sslfingerprint.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SSLFINGERPRINT_H_
-#define RTC_BASE_SSLFINGERPRINT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/ssl_fingerprint.h"
-
-#endif // RTC_BASE_SSLFINGERPRINT_H_
diff --git a/rtc_base/sslidentity.h b/rtc_base/sslidentity.h
deleted file mode 100644
index f1b69d4..0000000
--- a/rtc_base/sslidentity.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SSLIDENTITY_H_
-#define RTC_BASE_SSLIDENTITY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/ssl_identity.h"
-
-#endif // RTC_BASE_SSLIDENTITY_H_
diff --git a/rtc_base/sslroots.h b/rtc_base/sslroots.h
deleted file mode 100644
index 2e01a7e..0000000
--- a/rtc_base/sslroots.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SSLROOTS_H_
-#define RTC_BASE_SSLROOTS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/ssl_roots.h"
-
-#endif // RTC_BASE_SSLROOTS_H_
diff --git a/rtc_base/sslstreamadapter.h b/rtc_base/sslstreamadapter.h
deleted file mode 100644
index b051066..0000000
--- a/rtc_base/sslstreamadapter.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_SSLSTREAMADAPTER_H_
-#define RTC_BASE_SSLSTREAMADAPTER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/ssl_stream_adapter.h"
-
-#endif // RTC_BASE_SSLSTREAMADAPTER_H_
diff --git a/rtc_base/stringencode.h b/rtc_base/stringencode.h
deleted file mode 100644
index 3475286..0000000
--- a/rtc_base/stringencode.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_STRINGENCODE_H_
-#define RTC_BASE_STRINGENCODE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/string_encode.h"
-
-#endif // RTC_BASE_STRINGENCODE_H_
diff --git a/rtc_base/stringutils.h b/rtc_base/stringutils.h
deleted file mode 100644
index a593e57..0000000
--- a/rtc_base/stringutils.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_STRINGUTILS_H_
-#define RTC_BASE_STRINGUTILS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/string_utils.h"
-
-#endif // RTC_BASE_STRINGUTILS_H_
diff --git a/rtc_base/task_utils/repeating_task.cc b/rtc_base/task_utils/repeating_task.cc
index 874dcc4..c8cdf6a 100644
--- a/rtc_base/task_utils/repeating_task.cc
+++ b/rtc_base/task_utils/repeating_task.cc
@@ -10,7 +10,7 @@
#include "rtc_base/task_utils/repeating_task.h"
#include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace webrtc {
namespace webrtc_repeating_task_impl {
diff --git a/rtc_base/testbase64.h b/rtc_base/testbase64.h
deleted file mode 100644
index e3416e3..0000000
--- a/rtc_base/testbase64.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_TESTBASE64_H_
-#define RTC_BASE_TESTBASE64_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/test_base64.h"
-
-#endif // RTC_BASE_TESTBASE64_H_
diff --git a/rtc_base/testcertificateverifier.h b/rtc_base/testcertificateverifier.h
deleted file mode 100644
index a28ca51..0000000
--- a/rtc_base/testcertificateverifier.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_TESTCERTIFICATEVERIFIER_H_
-#define RTC_BASE_TESTCERTIFICATEVERIFIER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/test_certificate_verifier.h"
-
-#endif // RTC_BASE_TESTCERTIFICATEVERIFIER_H_
diff --git a/rtc_base/testclient.h b/rtc_base/testclient.h
deleted file mode 100644
index 7d1f442..0000000
--- a/rtc_base/testclient.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_TESTCLIENT_H_
-#define RTC_BASE_TESTCLIENT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/test_client.h"
-
-#endif // RTC_BASE_TESTCLIENT_H_
diff --git a/rtc_base/testechoserver.h b/rtc_base/testechoserver.h
deleted file mode 100644
index c261484..0000000
--- a/rtc_base/testechoserver.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_TESTECHOSERVER_H_
-#define RTC_BASE_TESTECHOSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/test_echo_server.h"
-
-#endif // RTC_BASE_TESTECHOSERVER_H_
diff --git a/rtc_base/testutils.h b/rtc_base/testutils.h
deleted file mode 100644
index 40f16d2..0000000
--- a/rtc_base/testutils.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_TESTUTILS_H_
-#define RTC_BASE_TESTUTILS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/test_utils.h"
-
-#endif // RTC_BASE_TESTUTILS_H_
diff --git a/rtc_base/timestampaligner.h b/rtc_base/timestampaligner.h
deleted file mode 100644
index 8c9a85f..0000000
--- a/rtc_base/timestampaligner.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_TIMESTAMPALIGNER_H_
-#define RTC_BASE_TIMESTAMPALIGNER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/timestamp_aligner.h"
-
-#endif // RTC_BASE_TIMESTAMPALIGNER_H_
diff --git a/rtc_base/timeutils.h b/rtc_base/timeutils.h
deleted file mode 100644
index 7926d12..0000000
--- a/rtc_base/timeutils.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_TIMEUTILS_H_
-#define RTC_BASE_TIMEUTILS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/time_utils.h"
-
-#endif // RTC_BASE_TIMEUTILS_H_
diff --git a/rtc_base/virtualsocketserver.h b/rtc_base/virtualsocketserver.h
deleted file mode 100644
index 5840023..0000000
--- a/rtc_base/virtualsocketserver.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_VIRTUALSOCKETSERVER_H_
-#define RTC_BASE_VIRTUALSOCKETSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/virtual_socket_server.h"
-
-#endif // RTC_BASE_VIRTUALSOCKETSERVER_H_
diff --git a/rtc_base/win32socketinit.h b/rtc_base/win32socketinit.h
deleted file mode 100644
index acb43d4..0000000
--- a/rtc_base/win32socketinit.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_WIN32SOCKETINIT_H_
-#define RTC_BASE_WIN32SOCKETINIT_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/win32_socket_init.h"
-
-#endif // RTC_BASE_WIN32SOCKETINIT_H_
diff --git a/rtc_base/win32socketserver.h b/rtc_base/win32socketserver.h
deleted file mode 100644
index ddc464b..0000000
--- a/rtc_base/win32socketserver.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_WIN32SOCKETSERVER_H_
-#define RTC_BASE_WIN32SOCKETSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/win32_socket_server.h"
-
-#endif // RTC_BASE_WIN32SOCKETSERVER_H_
diff --git a/rtc_base/win32window.h b/rtc_base/win32window.h
deleted file mode 100644
index 327cb45..0000000
--- a/rtc_base/win32window.h
+++ /dev/null
@@ -1,19 +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 RTC_BASE_WIN32WINDOW_H_
-#define RTC_BASE_WIN32WINDOW_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "rtc_base/win32_window.h"
-
-#endif // RTC_BASE_WIN32WINDOW_H_
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index f8977e2..2974e1a 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -539,10 +539,8 @@
"src/jni/android_histogram.cc",
"src/jni/android_network_monitor.cc",
"src/jni/android_network_monitor.h",
- "src/jni/androidnetworkmonitor.h",
"src/jni/class_loader.h",
"src/jni/class_reference_holder.h",
- "src/jni/classreferenceholder.h",
"src/jni/jni_common.cc",
"src/jni/jni_helpers.cc",
"src/jni/jni_helpers.h",
@@ -607,7 +605,6 @@
"src/jni/android_media_codec_common.h",
"src/jni/android_media_decoder.cc",
"src/jni/android_media_encoder.cc",
- "src/jni/androidmediacodeccommon.h",
]
deps = [
":base_jni",
@@ -638,16 +635,13 @@
sources = [
"src/jni/android_video_track_source.cc",
"src/jni/android_video_track_source.h",
- "src/jni/androidvideotracksource.h",
"src/jni/encoded_image.cc",
"src/jni/encoded_image.h",
- "src/jni/encodedimage.h",
"src/jni/h264_utils.cc",
"src/jni/java_i420_buffer.cc",
"src/jni/jni_generator_helper.h",
"src/jni/native_capturer_observer.cc",
"src/jni/native_capturer_observer.h",
- "src/jni/nativecapturerobserver.h",
"src/jni/nv12_buffer.cc",
"src/jni/nv21_buffer.cc",
"src/jni/pc/video.cc",
@@ -670,13 +664,6 @@
"src/jni/video_sink.h",
"src/jni/video_source.cc",
"src/jni/video_track.cc",
- "src/jni/videocodecinfo.h",
- "src/jni/videocodecstatus.h",
- "src/jni/videodecoderfactorywrapper.h",
- "src/jni/videodecoderwrapper.h",
- "src/jni/videoencoderfactorywrapper.h",
- "src/jni/videoencoderwrapper.h",
- "src/jni/videosink.h",
"src/jni/yuv_helper.cc",
]
@@ -711,21 +698,16 @@
sources = [
"src/jni/android_network_monitor_jni.h",
- "src/jni/androidnetworkmonitor_jni.h",
"src/jni/pc/android_network_monitor.h",
- "src/jni/pc/androidnetworkmonitor.h",
"src/jni/pc/audio_track.cc",
"src/jni/pc/call_session_file_rotating_log_sink.cc",
"src/jni/pc/crypto_options.cc",
"src/jni/pc/crypto_options.h",
- "src/jni/pc/cryptooptions.h",
"src/jni/pc/data_channel.cc",
"src/jni/pc/data_channel.h",
- "src/jni/pc/datachannel.h",
"src/jni/pc/dtmf_sender.cc",
"src/jni/pc/ice_candidate.cc",
"src/jni/pc/ice_candidate.h",
- "src/jni/pc/icecandidate.h",
"src/jni/pc/media_constraints.cc",
"src/jni/pc/media_constraints.h",
"src/jni/pc/media_source.cc",
@@ -733,24 +715,16 @@
"src/jni/pc/media_stream.h",
"src/jni/pc/media_stream_track.cc",
"src/jni/pc/media_stream_track.h",
- "src/jni/pc/mediaconstraints.h",
- "src/jni/pc/mediastream.h",
- "src/jni/pc/mediastreamtrack.h",
"src/jni/pc/owned_factory_and_threads.cc",
"src/jni/pc/owned_factory_and_threads.h",
- "src/jni/pc/ownedfactoryandthreads.h",
"src/jni/pc/peer_connection.cc",
"src/jni/pc/peer_connection.h",
"src/jni/pc/peer_connection_factory.cc",
"src/jni/pc/peer_connection_factory.h",
- "src/jni/pc/peerconnection.h",
- "src/jni/pc/peerconnectionfactory.h",
"src/jni/pc/rtc_certificate.cc",
"src/jni/pc/rtc_certificate.h",
"src/jni/pc/rtc_stats_collector_callback_wrapper.cc",
"src/jni/pc/rtc_stats_collector_callback_wrapper.h",
- "src/jni/pc/rtccertificate.h",
- "src/jni/pc/rtcstatscollectorcallbackwrapper.h",
"src/jni/pc/rtp_parameters.cc",
"src/jni/pc/rtp_parameters.h",
"src/jni/pc/rtp_receiver.cc",
@@ -759,25 +733,16 @@
"src/jni/pc/rtp_sender.h",
"src/jni/pc/rtp_transceiver.cc",
"src/jni/pc/rtp_transceiver.h",
- "src/jni/pc/rtpparameters.h",
- "src/jni/pc/rtpreceiver.h",
- "src/jni/pc/rtpsender.h",
- "src/jni/pc/rtptransceiver.h",
"src/jni/pc/sdp_observer.cc",
"src/jni/pc/sdp_observer.h",
- "src/jni/pc/sdpobserver.h",
"src/jni/pc/session_description.cc",
"src/jni/pc/session_description.h",
- "src/jni/pc/sessiondescription.h",
"src/jni/pc/ssl_certificate_verifier_wrapper.cc",
"src/jni/pc/ssl_certificate_verifier_wrapper.h",
- "src/jni/pc/sslcertificateverifierwrapper.h",
"src/jni/pc/stats_observer.cc",
"src/jni/pc/stats_observer.h",
- "src/jni/pc/statsobserver.h",
"src/jni/pc/turn_customizer.cc",
"src/jni/pc/turn_customizer.h",
- "src/jni/pc/turncustomizer.h",
]
deps = [
@@ -908,7 +873,6 @@
"native_api/base/init.h",
"native_api/base/network_monitor.cc",
"native_api/base/network_monitor.h",
- "native_api/base/networkmonitor.h",
]
deps = [
@@ -973,7 +937,6 @@
sources = [
"native_api/peerconnection/peer_connection_factory.cc",
"native_api/peerconnection/peer_connection_factory.h",
- "native_api/peerconnection/peerconnectionfactory.h",
]
deps = [
":base_jni",
@@ -1005,7 +968,6 @@
sources = [
"native_api/video/video_source.cc",
"native_api/video/video_source.h",
- "native_api/video/videosource.h",
"native_api/video/wrapper.cc",
"native_api/video/wrapper.h",
]
@@ -1102,7 +1064,6 @@
sources = [
"src/jni/video_frame.cc",
"src/jni/video_frame.h",
- "src/jni/videoframe.h",
"src/jni/wrapped_native_i420_buffer.cc",
"src/jni/wrapped_native_i420_buffer.h",
]
@@ -1125,7 +1086,6 @@
sources = [
"src/jni/logging/log_sink.cc",
"src/jni/logging/log_sink.h",
- "src/jni/logging/logsink.h",
]
deps = [
diff --git a/sdk/android/native_api/base/networkmonitor.h b/sdk/android/native_api/base/networkmonitor.h
deleted file mode 100644
index b903741..0000000
--- a/sdk/android/native_api/base/networkmonitor.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_NATIVE_API_BASE_NETWORKMONITOR_H_
-#define SDK_ANDROID_NATIVE_API_BASE_NETWORKMONITOR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/native_api/base/network_monitor.h"
-
-#endif // SDK_ANDROID_NATIVE_API_BASE_NETWORKMONITOR_H_
diff --git a/sdk/android/native_api/peerconnection/peerconnectionfactory.h b/sdk/android/native_api/peerconnection/peerconnectionfactory.h
deleted file mode 100644
index a9cea0a..0000000
--- a/sdk/android/native_api/peerconnection/peerconnectionfactory.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEERCONNECTIONFACTORY_H_
-#define SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEERCONNECTIONFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/native_api/peerconnection/peer_connection_factory.h"
-
-#endif // SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEERCONNECTIONFACTORY_H_
diff --git a/sdk/android/native_api/video/videosource.h b/sdk/android/native_api/video/videosource.h
deleted file mode 100644
index 6b18c84..0000000
--- a/sdk/android/native_api/video/videosource.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_NATIVE_API_VIDEO_VIDEOSOURCE_H_
-#define SDK_ANDROID_NATIVE_API_VIDEO_VIDEOSOURCE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/native_api/video/video_source.h"
-
-#endif // SDK_ANDROID_NATIVE_API_VIDEO_VIDEOSOURCE_H_
diff --git a/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc b/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc
index 4268fda..9a78f7a 100644
--- a/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc
+++ b/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc
@@ -12,7 +12,7 @@
#include <dlfcn.h>
#include <vector>
#include "absl/memory/memory.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/event.h"
#include "rtc_base/logging.h"
#include "rtc_base/platform_thread.h"
diff --git a/sdk/android/src/jni/androidmediacodeccommon.h b/sdk/android/src/jni/androidmediacodeccommon.h
deleted file mode 100644
index c0395ee..0000000
--- a/sdk/android/src/jni/androidmediacodeccommon.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
-#define SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/android_media_codec_common.h"
-
-#endif // SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
diff --git a/sdk/android/src/jni/androidnetworkmonitor.h b/sdk/android/src/jni/androidnetworkmonitor.h
deleted file mode 100644
index 704ffcb..0000000
--- a/sdk/android/src/jni/androidnetworkmonitor.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_H_
-#define SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/android_network_monitor.h"
-
-#endif // SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_H_
diff --git a/sdk/android/src/jni/androidnetworkmonitor_jni.h b/sdk/android/src/jni/androidnetworkmonitor_jni.h
deleted file mode 100644
index 4bd3d80..0000000
--- a/sdk/android/src/jni/androidnetworkmonitor_jni.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_
-#define SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/android_network_monitor_jni.h"
-
-#endif // SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_
diff --git a/sdk/android/src/jni/androidvideotracksource.h b/sdk/android/src/jni/androidvideotracksource.h
deleted file mode 100644
index cfa2064..0000000
--- a/sdk/android/src/jni/androidvideotracksource.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_ANDROIDVIDEOTRACKSOURCE_H_
-#define SDK_ANDROID_SRC_JNI_ANDROIDVIDEOTRACKSOURCE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/android_video_track_source.h"
-
-#endif // SDK_ANDROID_SRC_JNI_ANDROIDVIDEOTRACKSOURCE_H_
diff --git a/sdk/android/src/jni/classreferenceholder.h b/sdk/android/src/jni/classreferenceholder.h
deleted file mode 100644
index a404336..0000000
--- a/sdk/android/src/jni/classreferenceholder.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
-#define SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/class_reference_holder.h"
-
-#endif // SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
diff --git a/sdk/android/src/jni/encodedimage.h b/sdk/android/src/jni/encodedimage.h
deleted file mode 100644
index 6192785..0000000
--- a/sdk/android/src/jni/encodedimage.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_ENCODEDIMAGE_H_
-#define SDK_ANDROID_SRC_JNI_ENCODEDIMAGE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/encoded_image.h"
-
-#endif // SDK_ANDROID_SRC_JNI_ENCODEDIMAGE_H_
diff --git a/sdk/android/src/jni/logging/logsink.h b/sdk/android/src/jni/logging/logsink.h
deleted file mode 100644
index 8983cdd..0000000
--- a/sdk/android/src/jni/logging/logsink.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_LOGGING_LOGSINK_H_
-#define SDK_ANDROID_SRC_JNI_LOGGING_LOGSINK_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/logging/log_sink.h"
-
-#endif // SDK_ANDROID_SRC_JNI_LOGGING_LOGSINK_H_
diff --git a/sdk/android/src/jni/nativecapturerobserver.h b/sdk/android/src/jni/nativecapturerobserver.h
deleted file mode 100644
index 98dcc70..0000000
--- a/sdk/android/src/jni/nativecapturerobserver.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_
-#define SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/native_capturer_observer.h"
-
-#endif // SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_
diff --git a/sdk/android/src/jni/pc/androidnetworkmonitor.h b/sdk/android/src/jni/pc/androidnetworkmonitor.h
deleted file mode 100644
index c5409a0..0000000
--- a/sdk/android/src/jni/pc/androidnetworkmonitor.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_H_
-#define SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/android_network_monitor.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_H_
diff --git a/sdk/android/src/jni/pc/cryptooptions.h b/sdk/android/src/jni/pc/cryptooptions.h
deleted file mode 100644
index ebd88bc..0000000
--- a/sdk/android/src/jni/pc/cryptooptions.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_CRYPTOOPTIONS_H_
-#define SDK_ANDROID_SRC_JNI_PC_CRYPTOOPTIONS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/crypto_options.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_CRYPTOOPTIONS_H_
diff --git a/sdk/android/src/jni/pc/datachannel.h b/sdk/android/src/jni/pc/datachannel.h
deleted file mode 100644
index f62d773..0000000
--- a/sdk/android/src/jni/pc/datachannel.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_DATACHANNEL_H_
-#define SDK_ANDROID_SRC_JNI_PC_DATACHANNEL_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/data_channel.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_DATACHANNEL_H_
diff --git a/sdk/android/src/jni/pc/icecandidate.h b/sdk/android/src/jni/pc/icecandidate.h
deleted file mode 100644
index 96a659e..0000000
--- a/sdk/android/src/jni/pc/icecandidate.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_ICECANDIDATE_H_
-#define SDK_ANDROID_SRC_JNI_PC_ICECANDIDATE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/ice_candidate.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_ICECANDIDATE_H_
diff --git a/sdk/android/src/jni/pc/mediaconstraints.h b/sdk/android/src/jni/pc/mediaconstraints.h
deleted file mode 100644
index f46a79f..0000000
--- a/sdk/android/src/jni/pc/mediaconstraints.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_H_
-#define SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/media_constraints.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_H_
diff --git a/sdk/android/src/jni/pc/mediastream.h b/sdk/android/src/jni/pc/mediastream.h
deleted file mode 100644
index 81216b9..0000000
--- a/sdk/android/src/jni/pc/mediastream.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_MEDIASTREAM_H_
-#define SDK_ANDROID_SRC_JNI_PC_MEDIASTREAM_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/media_stream.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_MEDIASTREAM_H_
diff --git a/sdk/android/src/jni/pc/mediastreamtrack.h b/sdk/android/src/jni/pc/mediastreamtrack.h
deleted file mode 100644
index 779b80d..0000000
--- a/sdk/android/src/jni/pc/mediastreamtrack.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_MEDIASTREAMTRACK_H_
-#define SDK_ANDROID_SRC_JNI_PC_MEDIASTREAMTRACK_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/media_stream_track.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_MEDIASTREAMTRACK_H_
diff --git a/sdk/android/src/jni/pc/ownedfactoryandthreads.h b/sdk/android/src/jni/pc/ownedfactoryandthreads.h
deleted file mode 100644
index 2fb4d3d..0000000
--- a/sdk/android/src/jni/pc/ownedfactoryandthreads.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
-#define SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/owned_factory_and_threads.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
diff --git a/sdk/android/src/jni/pc/peerconnection.h b/sdk/android/src/jni/pc/peerconnection.h
deleted file mode 100644
index 97e3870..0000000
--- a/sdk/android/src/jni/pc/peerconnection.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_PEERCONNECTION_H_
-#define SDK_ANDROID_SRC_JNI_PC_PEERCONNECTION_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/peer_connection.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_PEERCONNECTION_H_
diff --git a/sdk/android/src/jni/pc/peerconnectionfactory.h b/sdk/android/src/jni/pc/peerconnectionfactory.h
deleted file mode 100644
index 42f6fda..0000000
--- a/sdk/android/src/jni/pc/peerconnectionfactory.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONFACTORY_H_
-#define SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONFACTORY_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/peer_connection_factory.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONFACTORY_H_
diff --git a/sdk/android/src/jni/pc/rtccertificate.h b/sdk/android/src/jni/pc/rtccertificate.h
deleted file mode 100644
index 5ea5eba..0000000
--- a/sdk/android/src/jni/pc/rtccertificate.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_RTCCERTIFICATE_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTCCERTIFICATE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/rtc_certificate.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_RTCCERTIFICATE_H_
diff --git a/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h b/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h
deleted file mode 100644
index 61c5ec3..0000000
--- a/sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
diff --git a/sdk/android/src/jni/pc/rtpparameters.h b/sdk/android/src/jni/pc/rtpparameters.h
deleted file mode 100644
index 646a550..0000000
--- a/sdk/android/src/jni/pc/rtpparameters.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_RTPPARAMETERS_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPPARAMETERS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/rtp_parameters.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_RTPPARAMETERS_H_
diff --git a/sdk/android/src/jni/pc/rtpreceiver.h b/sdk/android/src/jni/pc/rtpreceiver.h
deleted file mode 100644
index a96c0ca..0000000
--- a/sdk/android/src/jni/pc/rtpreceiver.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_RTPRECEIVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPRECEIVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/rtp_receiver.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_RTPRECEIVER_H_
diff --git a/sdk/android/src/jni/pc/rtpsender.h b/sdk/android/src/jni/pc/rtpsender.h
deleted file mode 100644
index a7d4328..0000000
--- a/sdk/android/src/jni/pc/rtpsender.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_RTPSENDER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPSENDER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/rtp_sender.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_RTPSENDER_H_
diff --git a/sdk/android/src/jni/pc/rtptransceiver.h b/sdk/android/src/jni/pc/rtptransceiver.h
deleted file mode 100644
index 1696a8a..0000000
--- a/sdk/android/src/jni/pc/rtptransceiver.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_RTPTRANSCEIVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPTRANSCEIVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/rtp_transceiver.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_RTPTRANSCEIVER_H_
diff --git a/sdk/android/src/jni/pc/sdpobserver.h b/sdk/android/src/jni/pc/sdpobserver.h
deleted file mode 100644
index 6a91933..0000000
--- a/sdk/android/src/jni/pc/sdpobserver.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/sdp_observer.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_H_
diff --git a/sdk/android/src/jni/pc/sessiondescription.h b/sdk/android/src/jni/pc/sessiondescription.h
deleted file mode 100644
index 939a430..0000000
--- a/sdk/android/src/jni/pc/sessiondescription.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_SESSIONDESCRIPTION_H_
-#define SDK_ANDROID_SRC_JNI_PC_SESSIONDESCRIPTION_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/session_description.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_SESSIONDESCRIPTION_H_
diff --git a/sdk/android/src/jni/pc/sslcertificateverifierwrapper.h b/sdk/android/src/jni/pc/sslcertificateverifierwrapper.h
deleted file mode 100644
index f22f171..0000000
--- a/sdk/android/src/jni/pc/sslcertificateverifierwrapper.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_SSLCERTIFICATEVERIFIERWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_PC_SSLCERTIFICATEVERIFIERWRAPPER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_SSLCERTIFICATEVERIFIERWRAPPER_H_
diff --git a/sdk/android/src/jni/pc/statsobserver.h b/sdk/android/src/jni/pc/statsobserver.h
deleted file mode 100644
index 50d6355..0000000
--- a/sdk/android/src/jni/pc/statsobserver.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/stats_observer.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_H_
diff --git a/sdk/android/src/jni/pc/turncustomizer.h b/sdk/android/src/jni/pc/turncustomizer.h
deleted file mode 100644
index 9718dd4..0000000
--- a/sdk/android/src/jni/pc/turncustomizer.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_PC_TURNCUSTOMIZER_H_
-#define SDK_ANDROID_SRC_JNI_PC_TURNCUSTOMIZER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/pc/turn_customizer.h"
-
-#endif // SDK_ANDROID_SRC_JNI_PC_TURNCUSTOMIZER_H_
diff --git a/sdk/android/src/jni/videocodecinfo.h b/sdk/android/src/jni/videocodecinfo.h
deleted file mode 100644
index 5ceb010..0000000
--- a/sdk/android/src/jni/videocodecinfo.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_VIDEOCODECINFO_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOCODECINFO_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/video_codec_info.h"
-
-#endif // SDK_ANDROID_SRC_JNI_VIDEOCODECINFO_H_
diff --git a/sdk/android/src/jni/videocodecstatus.h b/sdk/android/src/jni/videocodecstatus.h
deleted file mode 100644
index c8136ba..0000000
--- a/sdk/android/src/jni/videocodecstatus.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_VIDEOCODECSTATUS_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOCODECSTATUS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/video_codec_status.h"
-
-#endif // SDK_ANDROID_SRC_JNI_VIDEOCODECSTATUS_H_
diff --git a/sdk/android/src/jni/videodecoderfactorywrapper.h b/sdk/android/src/jni/videodecoderfactorywrapper.h
deleted file mode 100644
index 60513bd..0000000
--- a/sdk/android/src/jni/videodecoderfactorywrapper.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/video_decoder_factory_wrapper.h"
-
-#endif // SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
diff --git a/sdk/android/src/jni/videodecoderwrapper.h b/sdk/android/src/jni/videodecoderwrapper.h
deleted file mode 100644
index 78fd73d..0000000
--- a/sdk/android/src/jni/videodecoderwrapper.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/video_decoder_wrapper.h"
-
-#endif // SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
diff --git a/sdk/android/src/jni/videoencoderfactorywrapper.h b/sdk/android/src/jni/videoencoderfactorywrapper.h
deleted file mode 100644
index c42771c..0000000
--- a/sdk/android/src/jni/videoencoderfactorywrapper.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/video_encoder_factory_wrapper.h"
-
-#endif // SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
diff --git a/sdk/android/src/jni/videoencoderwrapper.h b/sdk/android/src/jni/videoencoderwrapper.h
deleted file mode 100644
index 144a001..0000000
--- a/sdk/android/src/jni/videoencoderwrapper.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/video_encoder_wrapper.h"
-
-#endif // SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
diff --git a/sdk/android/src/jni/videoframe.h b/sdk/android/src/jni/videoframe.h
deleted file mode 100644
index 3a8110e..0000000
--- a/sdk/android/src/jni/videoframe.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_VIDEOFRAME_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOFRAME_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/video_frame.h"
-
-#endif // SDK_ANDROID_SRC_JNI_VIDEOFRAME_H_
diff --git a/sdk/android/src/jni/videosink.h b/sdk/android/src/jni/videosink.h
deleted file mode 100644
index 04a337d..0000000
--- a/sdk/android/src/jni/videosink.h
+++ /dev/null
@@ -1,19 +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 SDK_ANDROID_SRC_JNI_VIDEOSINK_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOSINK_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "sdk/android/src/jni/video_sink.h"
-
-#endif // SDK_ANDROID_SRC_JNI_VIDEOSINK_H_
diff --git a/stats/BUILD.gn b/stats/BUILD.gn
index 4cd2fc8..85fe091 100644
--- a/stats/BUILD.gn
+++ b/stats/BUILD.gn
@@ -36,7 +36,6 @@
sources = [
"test/rtc_test_stats.cc",
"test/rtc_test_stats.h",
- "test/rtcteststats.h",
]
deps = [
diff --git a/stats/test/rtcteststats.h b/stats/test/rtcteststats.h
deleted file mode 100644
index 9e61c9d..0000000
--- a/stats/test/rtcteststats.h
+++ /dev/null
@@ -1,19 +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 STATS_TEST_RTCTESTSTATS_H_
-#define STATS_TEST_RTCTESTSTATS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "stats/test/rtc_test_stats.h"
-
-#endif // STATS_TEST_RTCTESTSTATS_H_
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 6165b95..5981af2 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -417,7 +417,6 @@
sources = [
"testsupport/ios_file_utils.h",
"testsupport/ios_file_utils.mm",
- "testsupport/iosfileutils.h",
]
deps = [
"..:webrtc_common",
@@ -437,7 +436,6 @@
sources = [
"testsupport/mac_file_utils.h",
"testsupport/mac_file_utils.mm",
- "testsupport/macfileutils.h",
]
deps = [
"../rtc_base:checks",
@@ -451,7 +449,6 @@
sources = [
"testsupport/file_utils.cc",
"testsupport/file_utils.h",
- "testsupport/fileutils.h",
]
deps = [
":fileutils_override_api",
@@ -479,7 +476,6 @@
testonly = true
sources = [
"testsupport/file_utils_override.h",
- "testsupport/fileutils_override.h",
]
}
diff --git a/test/logging/file_log_writer.cc b/test/logging/file_log_writer.cc
index f8c32f4..ced81fe 100644
--- a/test/logging/file_log_writer.cc
+++ b/test/logging/file_log_writer.cc
@@ -12,7 +12,7 @@
#include "absl/memory/memory.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
namespace webrtc {
namespace webrtc_impl {
diff --git a/test/logging/log_writer.h b/test/logging/log_writer.h
index 8946cec..9879eaa 100644
--- a/test/logging/log_writer.h
+++ b/test/logging/log_writer.h
@@ -14,7 +14,7 @@
#include <string>
#include <utility>
-#include "api/rtceventlogoutput.h"
+#include "api/rtc_event_log_output.h"
#include "rtc_base/strings/string_builder.h"
namespace webrtc {
diff --git a/test/testsupport/fileutils.h b/test/testsupport/fileutils.h
deleted file mode 100644
index a5cf8c0..0000000
--- a/test/testsupport/fileutils.h
+++ /dev/null
@@ -1,19 +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 TEST_TESTSUPPORT_FILEUTILS_H_
-#define TEST_TESTSUPPORT_FILEUTILS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "test/testsupport/file_utils.h"
-
-#endif // TEST_TESTSUPPORT_FILEUTILS_H_
diff --git a/test/testsupport/fileutils_override.h b/test/testsupport/fileutils_override.h
deleted file mode 100644
index 3cae9aa..0000000
--- a/test/testsupport/fileutils_override.h
+++ /dev/null
@@ -1,19 +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 TEST_TESTSUPPORT_FILEUTILS_OVERRIDE_H_
-#define TEST_TESTSUPPORT_FILEUTILS_OVERRIDE_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "test/testsupport/file_utils_override.h"
-
-#endif // TEST_TESTSUPPORT_FILEUTILS_OVERRIDE_H_
diff --git a/test/testsupport/iosfileutils.h b/test/testsupport/iosfileutils.h
deleted file mode 100644
index ad5a1f1..0000000
--- a/test/testsupport/iosfileutils.h
+++ /dev/null
@@ -1,19 +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 TEST_TESTSUPPORT_IOSFILEUTILS_H_
-#define TEST_TESTSUPPORT_IOSFILEUTILS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "test/testsupport/ios_file_utils.h"
-
-#endif // TEST_TESTSUPPORT_IOSFILEUTILS_H_
diff --git a/test/testsupport/macfileutils.h b/test/testsupport/macfileutils.h
deleted file mode 100644
index 56c6860..0000000
--- a/test/testsupport/macfileutils.h
+++ /dev/null
@@ -1,19 +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 TEST_TESTSUPPORT_MACFILEUTILS_H_
-#define TEST_TESTSUPPORT_MACFILEUTILS_H_
-
-// TODO(bugs.webrtc.org/10159): Remove this files once downstream projects have
-// been updated to include the new path.
-
-#include "test/testsupport/mac_file_utils.h"
-
-#endif // TEST_TESTSUPPORT_MACFILEUTILS_H_