Bug 1770463 - cleanup dom/media/webrtc/transport includes r=bwc

Differential Revision: https://phabricator.services.mozilla.com/D146926

dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp

@@ -34,14 +34,9 @@
  */
 
 #include <stdint.h>
-#include <time.h>
-#include <cstdio>
 #include <cstring>
 #include <iostream>
-#include <string>
-#include <memory>
 #include <assert.h>
-#include <limits.h>
 
 #include "gmp-platform.h"
 #include "gmp-video-host.h"

dom/media/webrtc/transport/dtlsidentity.cpp

@@ -12,15 +12,11 @@
 #include "nsError.h"
 #include "pk11pub.h"
 #include "sechash.h"
-#include "ssl.h"
 #include "mozpkix/nss_scoped_ptrs.h"
 #include "secerr.h"
 #include "sslerr.h"
 
 #include "mozilla/Sprintf.h"
-#include "mozilla/dom/CryptoBuffer.h"
-#include "mozilla/dom/CryptoKey.h"
-#include "ipc/IPCMessageUtils.h"
 
 namespace mozilla {
 

dom/media/webrtc/transport/nr_socket_proxy_config.cpp

@@ -6,8 +6,6 @@
 
 #include "nr_socket_proxy_config.h"
 
-#include "mozilla/dom/ipc/IdType.h"
-#include "mozilla/net/NeckoChannelParams.h"
 #include "mozilla/net/WebrtcProxyConfig.h"
 
 namespace mozilla {

dom/media/webrtc/transport/nr_timer.cpp

@@ -52,7 +52,6 @@
 #include <string>
 
 #include "nsCOMPtr.h"
-#include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIEventTarget.h"
 #include "nsINamed.h"
@@ -63,8 +62,10 @@
 #include "mozilla/UniquePtr.h"
 
 extern "C" {
-#include "nr_api.h"
+#include "async_wait.h"
 #include "async_timer.h"
+#include "r_errors.h"
+#include "r_log.h"
 }
 
 namespace mozilla {

dom/media/webrtc/transport/nricectx.cpp

@@ -45,24 +45,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "nr_socket_proxy_config.h"
 #include "nsXULAppAPI.h"
-#include "mozilla/UniquePtr.h"
-#include "mozilla/Unused.h"
 
 #include "logging.h"
-#include "nspr.h"
-#include "nss.h"
 #include "pk11pub.h"
 #include "plbase64.h"
 
 #include "nsCOMPtr.h"
-#include "nsComponentManagerUtils.h"
 #include "nsError.h"
 #include "nsNetCID.h"
 #include "nsServiceManagerUtils.h"
 #include "ScopedNSSTypes.h"
 #include "runnable_utils.h"
-#include "nsIPrefService.h"
-#include "nsIPrefBranch.h"
 #include "nsIUUIDGenerator.h"
 
 // nICEr includes
@@ -73,19 +66,15 @@ extern "C" {
 #include "r_crc32.h"
 #include "r_memory.h"
 #include "ice_reg.h"
-#include "ice_util.h"
 #include "transport_addr.h"
 #include "nr_crypto.h"
 #include "nr_socket.h"
 #include "nr_socket_local.h"
-#include "stun_client_ctx.h"
 #include "stun_reg.h"
-#include "stun_server_ctx.h"
 #include "stun_util.h"
 #include "ice_codeword.h"
 #include "ice_ctx.h"
 #include "ice_candidate.h"
-#include "ice_handler.h"
 }
 
 // Local includes
@@ -96,10 +85,6 @@ extern "C" {
 #include "rlogconnector.h"
 #include "test_nr_socket.h"
 
-extern "C" {
-#include "mdns_service/mdns_service.h"
-}
-
 namespace mozilla {
 
 using std::shared_ptr;

dom/media/webrtc/transport/nricemediastream.cpp

@@ -50,15 +50,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // nICEr includes
 extern "C" {
 #include "nr_api.h"
-#include "registry.h"
-#include "async_timer.h"
-#include "ice_util.h"
 #include "transport_addr.h"
-#include "nr_crypto.h"
 #include "nr_socket.h"
-#include "nr_socket_local.h"
-#include "stun_client_ctx.h"
-#include "stun_server_ctx.h"
 #include "ice_ctx.h"
 #include "ice_candidate.h"
 #include "ice_handler.h"

dom/media/webrtc/transport/nricemediastream.h

@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
-#include "nsCOMPtr.h"
+#include "nscore.h"
 
 #include "m_cpp_utils.h"
 

dom/media/webrtc/transport/nriceresolver.h

@@ -43,10 +43,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef nriceresolver_h__
 #define nriceresolver_h__
 
-#include <map>
-#include <string>
-#include "nspr.h"
-#include "prnetdb.h"
 #include "nsIDNSService.h"
 #include "nsIDNSListener.h"
 #include "nsICancelable.h"

dom/media/webrtc/transport/nriceresolverfake.cpp

@@ -40,15 +40,14 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "nspr.h"
-#include "prnetdb.h"
-
+#include "prio.h"
 #include "mozilla/Assertions.h"
 
 extern "C" {
-#include "nr_api.h"
+#include "async_wait.h"
 #include "async_timer.h"
 #include "nr_resolver.h"
+#include "r_macros.h"
 #include "transport_addr.h"
 }
 

dom/media/webrtc/transport/nriceresolverfake.h

@@ -46,8 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <map>
 #include <string>
 
-#include "nspr.h"
-#include "prnetdb.h"
+#include "csi_platform.h"
 
 typedef struct nr_resolver_ nr_resolver;
 typedef struct nr_resolver_vtbl_ nr_resolver_vtbl;

dom/media/webrtc/transport/nricestunaddr.cpp

@@ -7,7 +7,6 @@
 // nICEr includes
 extern "C" {
 #include "nr_api.h"
-#include "r_memory.h"
 #include "local_addr.h"
 }
 

dom/media/webrtc/transport/nrinterfaceprioritizer.cpp

@@ -7,8 +7,8 @@
 #include <string>
 #include <vector>
 #include "logging.h"
+#include "nr_api.h"
 #include "nrinterfaceprioritizer.h"
-#include "nsCOMPtr.h"
 
 MOZ_MTLOG_MODULE("mtransport")
 

dom/media/webrtc/transport/nrinterfaceprioritizer.h

@@ -5,7 +5,6 @@
 #define nrinterfacepriority_h__
 
 extern "C" {
-#include "nr_api.h"
 #include "nr_interface_prioritizer.h"
 }
 

dom/media/webrtc/transport/test_nr_socket.cpp

@@ -82,19 +82,15 @@ nrappkit copyright:
 
 extern "C" {
 #include "stun_msg.h"  // for NR_STUN_MAX_MESSAGE_SIZE
-#include "nr_api.h"
 #include "async_wait.h"
 #include "async_timer.h"
 #include "nr_socket.h"
-#include "nr_socket_local.h"
 #include "stun.h"
-#include "stun_hint.h"
 #include "transport_addr.h"
 }
 
 #include "mozilla/RefPtr.h"
 #include "test_nr_socket.h"
-#include "runnable_utils.h"
 
 namespace mozilla {
 

dom/media/webrtc/transport/test_nr_socket.h

@@ -94,7 +94,6 @@ extern "C" {
 }
 
 #include <set>
-#include <vector>
 #include <map>
 #include <list>
 #include <string>

dom/media/webrtc/transport/transportflow.cpp

@@ -7,13 +7,9 @@
 // Original author: ekr@rtfm.com
 #include <deque>
 
-#include "logging.h"
-#include "runnable_utils.h"
 #include "transportflow.h"
 #include "transportlayer.h"
 
-#include "mozilla/DebugOnly.h"
-
 namespace mozilla {
 
 NS_IMPL_ISUPPORTS0(TransportFlow)

dom/media/webrtc/transport/transportlayer.cpp

@@ -6,9 +6,7 @@
 
 // Original author: ekr@rtfm.com
 #include "logging.h"
-#include "transportflow.h"
 #include "transportlayer.h"
-#include "nsThreadUtils.h"
 
 // Logging context
 namespace mozilla {

dom/media/webrtc/transport/transportlayer.h

@@ -11,8 +11,6 @@
 
 #include "sigslot.h"
 
-#include "mozilla/DebugOnly.h"
-#include "mozilla/RefPtr.h"
 #include "nsCOMPtr.h"
 #include "nsIEventTarget.h"
 

dom/media/webrtc/transport/transportlayerdtls.cpp

@@ -19,12 +19,10 @@
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Unused.h"
 #include "nsCOMPtr.h"
-#include "nsComponentManagerUtils.h"
 #include "nsNetCID.h"
 #include "nsServiceManagerUtils.h"
 #include "sslexp.h"
 #include "sslproto.h"
-#include "transportflow.h"
 
 namespace mozilla {
 

dom/media/webrtc/transport/transportlayerdtls.h

@@ -18,11 +18,8 @@
 #  include <Security/CipherSuite.h>
 #endif
 
-#include "sigslot.h"
-
 #include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
-#include "mozilla/TimeStamp.h"
 #include "nsCOMPtr.h"
 #include "nsITimer.h"
 #include "ScopedNSSTypes.h"

dom/media/webrtc/transport/transportlayerice.cpp

@@ -41,36 +41,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <string>
-#include <vector>
 
-#include "nsCOMPtr.h"
 #include "nsComponentManagerUtils.h"
 #include "nsError.h"
 #include "nsNetCID.h"
-#include "nsServiceManagerUtils.h"
 
 // nICEr includes
 extern "C" {
 #include "nr_api.h"
-#include "registry.h"
-#include "async_timer.h"
 #include "ice_util.h"
 #include "transport_addr.h"
-#include "nr_crypto.h"
-#include "nr_socket.h"
-#include "nr_socket_local.h"
-#include "stun_client_ctx.h"
-#include "stun_server_ctx.h"
-#include "ice_ctx.h"
-#include "ice_candidate.h"
-#include "ice_handler.h"
 }
 
 // Local includes
 #include "logging.h"
-#include "nricectx.h"
 #include "nricemediastream.h"
-#include "transportflow.h"
 #include "transportlayerice.h"
 
 namespace mozilla {

dom/media/webrtc/transport/transportlayerice.h

@@ -10,17 +10,13 @@
 #ifndef transportlayerice_h__
 #define transportlayerice_h__
 
-#include <vector>
-
 #include "sigslot.h"
 
 #include "mozilla/RefPtr.h"
-#include "nsCOMPtr.h"
 
 #include "m_cpp_utils.h"
 
 #include "nricemediastream.h"
-#include "transportflow.h"
 #include "transportlayer.h"
 
 // An ICE transport layer -- corresponds to a single ICE

dom/media/webrtc/transport/transportlayerlog.cpp

@@ -7,7 +7,6 @@
 // Original author: ekr@rtfm.com
 
 #include "logging.h"
-#include "transportflow.h"
 #include "transportlayerlog.h"
 
 namespace mozilla {

dom/media/webrtc/transport/transportlayerlog.h

@@ -10,7 +10,6 @@
 #define transportlayerlog_h__
 
 #include "m_cpp_utils.h"
-#include "transportflow.h"
 #include "transportlayer.h"
 
 namespace mozilla {

dom/media/webrtc/transport/transportlayerloopback.cpp

@@ -7,15 +7,12 @@
 // Original author: ekr@rtfm.com
 
 #include "logging.h"
-#include "nspr.h"
 #include "prlock.h"
 
 #include "nsNetCID.h"
-#include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "nsString.h"
 
-#include "transportflow.h"
 #include "transportlayerloopback.h"
 
 namespace mozilla {

dom/media/webrtc/transport/transportlayerloopback.h

@@ -9,11 +9,8 @@
 #ifndef transportlayerloopback_h__
 #define transportlayerloopback_h__
 
-#include "nspr.h"
-#include "prio.h"
 #include "prlock.h"
 
-#include <memory>
 #include <queue>
 
 #include "nsCOMPtr.h"
@@ -21,7 +18,6 @@
 #include "nsITimer.h"
 
 #include "m_cpp_utils.h"
-#include "transportflow.h"
 #include "transportlayer.h"
 
 // A simple loopback transport layer that is used for testing.

dom/media/webrtc/transport/transportlayersrtp.cpp

@@ -12,7 +12,6 @@
 #include "logging.h"
 #include "nsError.h"
 #include "mozilla/Assertions.h"
-#include "srtp.h"
 
 namespace mozilla {