From 6747441445a9df330fd2341c882ccc065e2e5df6 Mon Sep 17 00:00:00 2001 From: Michael Froman Date: Tue, 22 Sep 2020 21:43:49 +0000 Subject: [PATCH] Bug 1664898 - move media/mtransport to media/transport. r=ng Differential Revision: https://phabricator.services.mozilla.com/D90309 --- .clang-format-ignore | 2 +- build/clang-plugin/Utils.h | 2 +- dom/bindings/moz.build | 2 +- dom/media/MediaManager.h | 2 +- dom/media/MediaTrackGraph.cpp | 2 +- dom/media/bridge/components.conf | 4 +- dom/media/bridge/moz.build | 3 +- dom/media/gmp/moz.build | 4 +- dom/media/moz.build | 4 +- dom/media/webrtc/MediaEngineWebRTCAudio.cpp | 2 +- dom/media/webrtc/PMediaTransport.ipdl | 2 +- dom/media/webrtc/RTCCertificate.cpp | 2 +- dom/media/webrtc/WebrtcIPCTraits.h | 2 +- dom/media/webrtc/tests/fuzztests/moz.build | 2 +- .../media/webrtc/transport}/README | 0 .../media/webrtc/transport}/SrtpFlow.cpp | 0 .../media/webrtc/transport}/SrtpFlow.h | 0 .../transport}/WebrtcTCPSocketWrapper.cpp | 0 .../transport}/WebrtcTCPSocketWrapper.h | 0 .../media/webrtc/transport}/build/moz.build | 4 +- .../media/webrtc/transport}/common.build | 44 ++++++------- .../media/webrtc/transport}/dtlsidentity.cpp | 0 .../media/webrtc/transport}/dtlsidentity.h | 0 dom/media/webrtc/transport/fuzztest/moz.build | 32 +++++++++ .../fuzztest/stun_parser_libfuzz.cpp | 0 .../ipc/NrIceStunAddrMessageUtils.h | 2 +- .../webrtc/transport}/ipc/PStunAddrsParams.h | 2 +- .../transport}/ipc/PStunAddrsRequest.ipdl | 0 .../transport}/ipc/PWebrtcTCPSocket.ipdl | 0 .../transport}/ipc/StunAddrsRequestChild.cpp | 0 .../transport}/ipc/StunAddrsRequestChild.h | 0 .../transport}/ipc/StunAddrsRequestParent.cpp | 6 +- .../transport}/ipc/StunAddrsRequestParent.h | 0 .../transport}/ipc/WebrtcProxyConfig.ipdlh | 0 .../webrtc/transport}/ipc/WebrtcTCPSocket.cpp | 0 .../webrtc/transport}/ipc/WebrtcTCPSocket.h | 0 .../transport}/ipc/WebrtcTCPSocketCallback.h | 0 .../transport}/ipc/WebrtcTCPSocketChild.cpp | 0 .../transport}/ipc/WebrtcTCPSocketChild.h | 2 +- .../transport}/ipc/WebrtcTCPSocketLog.cpp | 0 .../transport}/ipc/WebrtcTCPSocketLog.h | 0 .../transport}/ipc/WebrtcTCPSocketParent.cpp | 0 .../transport}/ipc/WebrtcTCPSocketParent.h | 0 .../media/webrtc/transport}/ipc/moz.build | 4 +- .../media/webrtc/transport}/logging.h | 0 .../media/webrtc/transport}/m_cpp_utils.h | 0 .../webrtc/transport}/mdns_service/Cargo.toml | 0 .../transport}/mdns_service/mdns_service.h | 0 .../webrtc/transport}/mdns_service/src/lib.rs | 0 .../media/webrtc/transport}/mediapacket.cpp | 0 .../media/webrtc/transport}/mediapacket.h | 0 .../media/webrtc/transport}/moz.build | 6 +- .../transport}/nr_socket_proxy_config.cpp | 0 .../transport}/nr_socket_proxy_config.h | 0 .../webrtc/transport}/nr_socket_prsock.cpp | 0 .../webrtc/transport}/nr_socket_prsock.h | 0 .../media/webrtc/transport}/nr_socket_tcp.cpp | 0 .../media/webrtc/transport}/nr_socket_tcp.h | 0 .../media/webrtc/transport}/nr_timer.cpp | 0 .../media/webrtc/transport}/nricectx.cpp | 0 .../media/webrtc/transport}/nricectx.h | 0 .../webrtc/transport}/nricemediastream.cpp | 0 .../webrtc/transport}/nricemediastream.h | 0 .../media/webrtc/transport}/nriceresolver.cpp | 2 +- .../media/webrtc/transport}/nriceresolver.h | 0 .../webrtc/transport}/nriceresolverfake.cpp | 0 .../webrtc/transport}/nriceresolverfake.h | 0 .../media/webrtc/transport}/nricestunaddr.cpp | 0 .../media/webrtc/transport}/nricestunaddr.h | 2 +- .../transport}/nrinterfaceprioritizer.cpp | 0 .../transport}/nrinterfaceprioritizer.h | 0 .../media/webrtc/transport}/rlogconnector.cpp | 0 .../media/webrtc/transport}/rlogconnector.h | 0 .../media/webrtc/transport}/runnable_utils.h | 0 .../media/webrtc/transport}/sigslot.h | 0 .../webrtc/transport}/simpletokenbucket.cpp | 0 .../webrtc/transport}/simpletokenbucket.h | 0 .../webrtc/transport}/stun_socket_filter.cpp | 0 .../webrtc/transport}/stun_socket_filter.h | 0 .../transport}/test/TestSyncRunnable.cpp | 0 .../test/buffered_stun_socket_unittest.cpp | 0 .../webrtc/transport}/test/dummysocket.h | 0 .../transport}/test/gtest_ringbuffer_dumper.h | 0 .../webrtc/transport}/test/gtest_utils.h | 0 .../webrtc/transport}/test/ice_unittest.cpp | 0 .../media/webrtc/transport}/test/moz.build | 40 +++++------ .../transport}/test/mtransport_test_utils.h | 0 .../test/multi_tcp_socket_unittest.cpp | 0 .../transport}/test/nrappkit_unittest.cpp | 0 .../test/proxy_tunnel_socket_unittest.cpp | 0 .../test/rlogconnector_unittest.cpp | 0 .../test/runnable_utils_unittest.cpp | 0 .../webrtc/transport}/test/sctp_unittest.cpp | 0 .../test/simpletokenbucket_unittest.cpp | 0 .../test/sockettransportservice_unittest.cpp | 0 .../webrtc/transport}/test/stunserver.cpp | 0 .../media/webrtc/transport}/test/stunserver.h | 0 .../test/test_nr_socket_ice_unittest.cpp | 0 .../test/test_nr_socket_unittest.cpp | 0 .../transport}/test/transport_unittests.cpp | 0 .../webrtc/transport}/test/turn_unittest.cpp | 0 .../test/webrtcproxychannel_unittest.cpp | 0 .../webrtc/transport}/test_nr_socket.cpp | 0 .../media/webrtc/transport}/test_nr_socket.h | 0 .../webrtc/transport}/third_party/import.py | 0 .../webrtc/transport}/third_party/moz.build | 0 .../transport}/third_party/nICEr/IMPORT_FILES | 0 .../transport}/third_party/nICEr/README | 0 .../third_party/nICEr/README_MOZILLA | 0 .../transport}/third_party/nICEr/nicer.gyp | 0 .../third_party/nICEr/src/crypto/nr_crypto.c | 0 .../third_party/nICEr/src/crypto/nr_crypto.h | 0 .../third_party/nICEr/src/ice/ice_candidate.c | 0 .../third_party/nICEr/src/ice/ice_candidate.h | 0 .../nICEr/src/ice/ice_candidate_pair.c | 0 .../nICEr/src/ice/ice_candidate_pair.h | 0 .../third_party/nICEr/src/ice/ice_codeword.h | 0 .../third_party/nICEr/src/ice/ice_component.c | 0 .../third_party/nICEr/src/ice/ice_component.h | 0 .../third_party/nICEr/src/ice/ice_ctx.c | 0 .../third_party/nICEr/src/ice/ice_ctx.h | 0 .../third_party/nICEr/src/ice/ice_handler.h | 0 .../nICEr/src/ice/ice_media_stream.c | 0 .../nICEr/src/ice/ice_media_stream.h | 0 .../third_party/nICEr/src/ice/ice_parser.c | 0 .../third_party/nICEr/src/ice/ice_peer_ctx.c | 0 .../third_party/nICEr/src/ice/ice_peer_ctx.h | 0 .../third_party/nICEr/src/ice/ice_reg.h | 0 .../third_party/nICEr/src/ice/ice_socket.c | 0 .../third_party/nICEr/src/ice/ice_socket.h | 0 .../third_party/nICEr/src/net/local_addr.c | 0 .../third_party/nICEr/src/net/local_addr.h | 0 .../nICEr/src/net/nr_interface_prioritizer.c | 0 .../nICEr/src/net/nr_interface_prioritizer.h | 0 .../third_party/nICEr/src/net/nr_resolver.c | 0 .../third_party/nICEr/src/net/nr_resolver.h | 0 .../third_party/nICEr/src/net/nr_socket.c | 0 .../third_party/nICEr/src/net/nr_socket.h | 0 .../nICEr/src/net/nr_socket_local.h | 0 .../nICEr/src/net/nr_socket_multi_tcp.c | 0 .../nICEr/src/net/nr_socket_multi_tcp.h | 0 .../nICEr/src/net/nr_socket_wrapper.c | 0 .../nICEr/src/net/nr_socket_wrapper.h | 0 .../nICEr/src/net/transport_addr.c | 0 .../nICEr/src/net/transport_addr.h | 0 .../nICEr/src/net/transport_addr_reg.c | 0 .../nICEr/src/net/transport_addr_reg.h | 0 .../third_party/nICEr/src/stun/addrs-bsd.c | 0 .../third_party/nICEr/src/stun/addrs-bsd.h | 0 .../nICEr/src/stun/addrs-netlink.c | 0 .../nICEr/src/stun/addrs-netlink.h | 0 .../third_party/nICEr/src/stun/addrs-win32.c | 0 .../third_party/nICEr/src/stun/addrs-win32.h | 0 .../third_party/nICEr/src/stun/addrs.c | 0 .../third_party/nICEr/src/stun/addrs.h | 0 .../nICEr/src/stun/nr_socket_buffered_stun.c | 0 .../nICEr/src/stun/nr_socket_buffered_stun.h | 0 .../nICEr/src/stun/nr_socket_turn.c | 0 .../nICEr/src/stun/nr_socket_turn.h | 0 .../third_party/nICEr/src/stun/stun.h | 0 .../third_party/nICEr/src/stun/stun_build.c | 0 .../third_party/nICEr/src/stun/stun_build.h | 0 .../nICEr/src/stun/stun_client_ctx.c | 0 .../nICEr/src/stun/stun_client_ctx.h | 0 .../third_party/nICEr/src/stun/stun_codec.c | 0 .../third_party/nICEr/src/stun/stun_codec.h | 0 .../third_party/nICEr/src/stun/stun_hint.c | 0 .../third_party/nICEr/src/stun/stun_hint.h | 0 .../third_party/nICEr/src/stun/stun_msg.c | 0 .../third_party/nICEr/src/stun/stun_msg.h | 0 .../third_party/nICEr/src/stun/stun_proc.c | 0 .../third_party/nICEr/src/stun/stun_proc.h | 0 .../third_party/nICEr/src/stun/stun_reg.h | 0 .../nICEr/src/stun/stun_server_ctx.c | 0 .../nICEr/src/stun/stun_server_ctx.h | 0 .../third_party/nICEr/src/stun/stun_util.c | 0 .../third_party/nICEr/src/stun/stun_util.h | 0 .../nICEr/src/stun/turn_client_ctx.c | 0 .../nICEr/src/stun/turn_client_ctx.h | 0 .../third_party/nICEr/src/util/cb_args.c | 0 .../third_party/nICEr/src/util/cb_args.h | 0 .../third_party/nICEr/src/util/ice_util.c | 0 .../third_party/nICEr/src/util/ice_util.h | 0 .../third_party/nICEr/upstream.diff | 0 .../transport}/third_party/nrappkit/COPYRIGHT | 0 .../third_party/nrappkit/IMPORT_FILES | 0 .../transport}/third_party/nrappkit/README | 0 .../third_party/nrappkit/README_MOZILLA | 0 .../transport}/third_party/nrappkit/VERSION | 0 .../third_party/nrappkit/nrappkit.gyp | 0 .../nrappkit/src/event/async_timer.h | 0 .../nrappkit/src/event/async_wait.h | 0 .../nrappkit/src/event/async_wait_int.h | 0 .../third_party/nrappkit/src/log/r_log.c | 0 .../third_party/nrappkit/src/log/r_log.h | 0 .../nrappkit/src/plugin/nr_plugin.h | 0 .../src/port/android/include/android_funcs.h | 0 .../src/port/android/include/csi_platform.h | 0 .../src/port/android/include/sys/ttycom.h | 0 .../nrappkit/src/port/android/port-impl.mk | 0 .../src/port/darwin/include/csi_platform.h | 0 .../src/port/generic/include/sys/queue.h | 0 .../src/port/linux/include/csi_platform.h | 0 .../src/port/linux/include/linux_funcs.h | 0 .../src/port/linux/include/sys/ttycom.h | 0 .../nrappkit/src/port/linux/port-impl.mk | 0 .../src/port/win32/include/csi_platform.h | 0 .../third_party/nrappkit/src/registry/c2ru.c | 0 .../third_party/nrappkit/src/registry/c2ru.h | 0 .../nrappkit/src/registry/registry.c | 0 .../nrappkit/src/registry/registry.h | 0 .../nrappkit/src/registry/registry_int.h | 0 .../nrappkit/src/registry/registry_local.c | 0 .../nrappkit/src/registry/registry_vtbl.h | 0 .../nrappkit/src/registry/registrycb.c | 0 .../third_party/nrappkit/src/share/nr_api.h | 0 .../nrappkit/src/share/nr_common.h | 0 .../nrappkit/src/share/nr_reg_keys.h | 0 .../third_party/nrappkit/src/stats/nrstats.h | 0 .../third_party/nrappkit/src/util/byteorder.c | 0 .../third_party/nrappkit/src/util/byteorder.h | 0 .../third_party/nrappkit/src/util/hex.c | 0 .../third_party/nrappkit/src/util/hex.h | 0 .../nrappkit/src/util/libekr/assoc.h | 0 .../nrappkit/src/util/libekr/debug.c | 0 .../nrappkit/src/util/libekr/debug.h | 0 .../nrappkit/src/util/libekr/r_assoc.c | 0 .../nrappkit/src/util/libekr/r_assoc.h | 0 .../nrappkit/src/util/libekr/r_common.h | 0 .../nrappkit/src/util/libekr/r_crc32.c | 0 .../nrappkit/src/util/libekr/r_crc32.h | 0 .../nrappkit/src/util/libekr/r_data.c | 0 .../nrappkit/src/util/libekr/r_data.h | 0 .../nrappkit/src/util/libekr/r_defaults.h | 0 .../nrappkit/src/util/libekr/r_errors.c | 0 .../nrappkit/src/util/libekr/r_errors.h | 0 .../nrappkit/src/util/libekr/r_includes.h | 0 .../nrappkit/src/util/libekr/r_list.c | 0 .../nrappkit/src/util/libekr/r_list.h | 0 .../nrappkit/src/util/libekr/r_macros.h | 0 .../nrappkit/src/util/libekr/r_memory.c | 0 .../nrappkit/src/util/libekr/r_memory.h | 0 .../nrappkit/src/util/libekr/r_replace.c | 0 .../nrappkit/src/util/libekr/r_thread.h | 0 .../nrappkit/src/util/libekr/r_time.c | 0 .../nrappkit/src/util/libekr/r_time.h | 0 .../nrappkit/src/util/libekr/r_types.h | 0 .../third_party/nrappkit/src/util/p_buf.c | 0 .../third_party/nrappkit/src/util/p_buf.h | 0 .../third_party/nrappkit/src/util/util.c | 0 .../third_party/nrappkit/src/util/util.h | 0 .../third_party/nrappkit/upstream.diff | 66 +++++++++---------- .../media/webrtc/transport}/transportflow.cpp | 0 .../media/webrtc/transport}/transportflow.h | 0 .../webrtc/transport}/transportlayer.cpp | 0 .../media/webrtc/transport}/transportlayer.h | 0 .../webrtc/transport}/transportlayerdtls.cpp | 0 .../webrtc/transport}/transportlayerdtls.h | 0 .../webrtc/transport}/transportlayerice.cpp | 0 .../webrtc/transport}/transportlayerice.h | 0 .../webrtc/transport}/transportlayerlog.cpp | 0 .../webrtc/transport}/transportlayerlog.h | 0 .../transport}/transportlayerloopback.cpp | 0 .../transport}/transportlayerloopback.h | 0 .../webrtc/transport}/transportlayersrtp.cpp | 0 .../webrtc/transport}/transportlayersrtp.h | 0 dom/network/UDPSocketParent.cpp | 4 +- dom/plugins/ipc/FunctionBroker.h | 2 +- gfx/layers/ipc/ImageBridgeChild.cpp | 2 +- gfx/layers/ipc/VideoBridgeChild.cpp | 2 +- gfx/webrender_bindings/RenderThread.cpp | 2 +- media/mtransport/fuzztest/moz.build | 32 --------- media/webrtc/signaling/gtest/moz.build | 6 +- media/webrtc/signaling/src/common/moz.build | 2 +- media/webrtc/signaling/src/jsep/moz.build | 2 +- .../src/media-conduit/AudioConduit.cpp | 2 +- .../signaling/src/media-conduit/moz.build | 2 +- .../src/mediapipeline/MediaPipeline.h | 2 +- .../signaling/src/mediapipeline/RtpLogger.h | 2 +- .../signaling/src/mediapipeline/moz.build | 2 +- .../signaling/src/peerconnection/moz.build | 2 +- media/webrtc/signaling/src/sdp/moz.build | 2 +- netwerk/base/nsUDPSocket.cpp | 2 +- netwerk/ipc/moz.build | 12 ++-- netwerk/sctp/datachannel/DataChannel.cpp | 4 +- netwerk/sctp/datachannel/DataChannel.h | 4 +- netwerk/sctp/datachannel/moz.build | 2 +- testing/runcppunittests.py | 2 +- toolkit/content/license.html | 18 ++--- toolkit/library/rust/shared/Cargo.toml | 2 +- toolkit/toolkit.mozbuild | 4 +- tools/fuzzing/docs/fuzzing_interface.rst | 8 +-- tools/lint/clippy.yml | 2 +- tools/lint/file-whitespace.yml | 2 +- tools/lint/rejected-words.yml | 4 +- tools/rewriting/ThirdPartyPaths.txt | 2 +- widget/windows/WinCompositorWindowThread.cpp | 2 +- 297 files changed, 192 insertions(+), 193 deletions(-) rename {media/mtransport => dom/media/webrtc/transport}/README (100%) rename {media/mtransport => dom/media/webrtc/transport}/SrtpFlow.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/SrtpFlow.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/WebrtcTCPSocketWrapper.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/WebrtcTCPSocketWrapper.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/build/moz.build (96%) rename {media/mtransport => dom/media/webrtc/transport}/common.build (59%) rename {media/mtransport => dom/media/webrtc/transport}/dtlsidentity.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/dtlsidentity.h (100%) create mode 100644 dom/media/webrtc/transport/fuzztest/moz.build rename {media/mtransport => dom/media/webrtc/transport}/fuzztest/stun_parser_libfuzz.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/NrIceStunAddrMessageUtils.h (97%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/PStunAddrsParams.h (95%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/PStunAddrsRequest.ipdl (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/PWebrtcTCPSocket.ipdl (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/StunAddrsRequestChild.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/StunAddrsRequestChild.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/StunAddrsRequestParent.cpp (98%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/StunAddrsRequestParent.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/WebrtcProxyConfig.ipdlh (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/WebrtcTCPSocket.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/WebrtcTCPSocket.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/WebrtcTCPSocketCallback.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/WebrtcTCPSocketChild.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/WebrtcTCPSocketChild.h (97%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/WebrtcTCPSocketLog.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/WebrtcTCPSocketLog.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/WebrtcTCPSocketParent.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/WebrtcTCPSocketParent.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/ipc/moz.build (92%) rename {media/mtransport => dom/media/webrtc/transport}/logging.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/m_cpp_utils.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/mdns_service/Cargo.toml (100%) rename {media/mtransport => dom/media/webrtc/transport}/mdns_service/mdns_service.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/mdns_service/src/lib.rs (100%) rename {media/mtransport => dom/media/webrtc/transport}/mediapacket.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/mediapacket.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/moz.build (82%) rename {media/mtransport => dom/media/webrtc/transport}/nr_socket_proxy_config.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/nr_socket_proxy_config.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/nr_socket_prsock.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/nr_socket_prsock.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/nr_socket_tcp.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/nr_socket_tcp.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/nr_timer.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/nricectx.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/nricectx.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/nricemediastream.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/nricemediastream.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/nriceresolver.cpp (99%) rename {media/mtransport => dom/media/webrtc/transport}/nriceresolver.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/nriceresolverfake.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/nriceresolverfake.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/nricestunaddr.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/nricestunaddr.h (93%) rename {media/mtransport => dom/media/webrtc/transport}/nrinterfaceprioritizer.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/nrinterfaceprioritizer.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/rlogconnector.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/rlogconnector.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/runnable_utils.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/sigslot.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/simpletokenbucket.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/simpletokenbucket.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/stun_socket_filter.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/stun_socket_filter.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/TestSyncRunnable.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/buffered_stun_socket_unittest.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/dummysocket.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/gtest_ringbuffer_dumper.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/gtest_utils.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/ice_unittest.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/moz.build (63%) rename {media/mtransport => dom/media/webrtc/transport}/test/mtransport_test_utils.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/multi_tcp_socket_unittest.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/nrappkit_unittest.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/proxy_tunnel_socket_unittest.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/rlogconnector_unittest.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/runnable_utils_unittest.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/sctp_unittest.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/simpletokenbucket_unittest.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/sockettransportservice_unittest.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/stunserver.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/stunserver.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/test_nr_socket_ice_unittest.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/test_nr_socket_unittest.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/transport_unittests.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/turn_unittest.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test/webrtcproxychannel_unittest.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test_nr_socket.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/test_nr_socket.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/import.py (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/moz.build (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/IMPORT_FILES (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/README (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/README_MOZILLA (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/nicer.gyp (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/crypto/nr_crypto.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/crypto/nr_crypto.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_candidate.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_candidate.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_candidate_pair.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_candidate_pair.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_codeword.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_component.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_component.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_ctx.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_ctx.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_handler.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_media_stream.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_media_stream.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_parser.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_peer_ctx.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_peer_ctx.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_reg.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_socket.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/ice/ice_socket.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/local_addr.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/local_addr.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/nr_interface_prioritizer.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/nr_interface_prioritizer.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/nr_resolver.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/nr_resolver.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/nr_socket.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/nr_socket.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/nr_socket_local.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/nr_socket_multi_tcp.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/nr_socket_multi_tcp.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/nr_socket_wrapper.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/nr_socket_wrapper.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/transport_addr.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/transport_addr.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/transport_addr_reg.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/net/transport_addr_reg.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/addrs-bsd.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/addrs-bsd.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/addrs-netlink.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/addrs-netlink.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/addrs-win32.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/addrs-win32.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/addrs.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/addrs.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/nr_socket_buffered_stun.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/nr_socket_buffered_stun.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/nr_socket_turn.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/nr_socket_turn.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_build.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_build.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_client_ctx.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_client_ctx.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_codec.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_codec.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_hint.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_hint.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_msg.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_msg.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_proc.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_proc.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_reg.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_server_ctx.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_server_ctx.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_util.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/stun_util.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/turn_client_ctx.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/stun/turn_client_ctx.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/util/cb_args.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/util/cb_args.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/util/ice_util.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/src/util/ice_util.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nICEr/upstream.diff (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/COPYRIGHT (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/IMPORT_FILES (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/README (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/README_MOZILLA (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/VERSION (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/nrappkit.gyp (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/event/async_timer.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/event/async_wait.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/event/async_wait_int.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/log/r_log.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/log/r_log.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/plugin/nr_plugin.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/port/android/include/android_funcs.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/port/android/include/csi_platform.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/port/android/include/sys/ttycom.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/port/android/port-impl.mk (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/port/darwin/include/csi_platform.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/port/generic/include/sys/queue.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/port/linux/include/csi_platform.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/port/linux/include/linux_funcs.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/port/linux/include/sys/ttycom.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/port/linux/port-impl.mk (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/port/win32/include/csi_platform.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/registry/c2ru.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/registry/c2ru.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/registry/registry.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/registry/registry.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/registry/registry_int.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/registry/registry_local.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/registry/registry_vtbl.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/registry/registrycb.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/share/nr_api.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/share/nr_common.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/share/nr_reg_keys.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/stats/nrstats.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/byteorder.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/byteorder.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/hex.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/hex.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/assoc.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/debug.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/debug.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_assoc.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_assoc.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_common.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_crc32.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_crc32.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_data.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_data.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_defaults.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_errors.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_errors.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_includes.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_list.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_list.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_macros.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_memory.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_memory.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_replace.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_thread.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_time.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_time.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/libekr/r_types.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/p_buf.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/p_buf.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/util.c (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/src/util/util.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/third_party/nrappkit/upstream.diff (69%) rename {media/mtransport => dom/media/webrtc/transport}/transportflow.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/transportflow.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/transportlayer.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/transportlayer.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/transportlayerdtls.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/transportlayerdtls.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/transportlayerice.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/transportlayerice.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/transportlayerlog.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/transportlayerlog.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/transportlayerloopback.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/transportlayerloopback.h (100%) rename {media/mtransport => dom/media/webrtc/transport}/transportlayersrtp.cpp (100%) rename {media/mtransport => dom/media/webrtc/transport}/transportlayersrtp.h (100%) delete mode 100644 media/mtransport/fuzztest/moz.build diff --git a/.clang-format-ignore b/.clang-format-ignore index 9ab5e205e3aa..be50d9ddb73f 100644 --- a/.clang-format-ignore +++ b/.clang-format-ignore @@ -78,6 +78,7 @@ dom/media/platforms/ffmpeg/ffmpeg58/.* dom/media/platforms/ffmpeg/libav53/.* dom/media/platforms/ffmpeg/libav54/.* dom/media/platforms/ffmpeg/libav55/.* +dom/media/webrtc/transport/third_party/.* dom/media/webspeech/recognition/endpointer.cc dom/media/webspeech/recognition/endpointer.h dom/media/webspeech/recognition/energy_endpointer.cc @@ -154,7 +155,6 @@ media/libvorbis/.* media/libvpx/.* media/libwebp/.* media/libyuv/.* -media/mtransport/third_party/.* media/openmax_dl/.* media/openmax_il/.* media/webrtc/signaling/src/sdp/sipcc/.* diff --git a/build/clang-plugin/Utils.h b/build/clang-plugin/Utils.h index 1a3977fe604f..d38f25d3b779 100644 --- a/build/clang-plugin/Utils.h +++ b/build/clang-plugin/Utils.h @@ -229,7 +229,7 @@ inline bool isIgnoredPathForSprintfLiteral(const CallExpr *Call, Begin->compare_lower(StringRef("icu")) == 0 || Begin->compare_lower(StringRef("jsoncpp")) == 0 || Begin->compare_lower(StringRef("libstagefright")) == 0 || - Begin->compare_lower(StringRef("mtransport")) == 0 || + Begin->compare_lower(StringRef("transport")) == 0 || Begin->compare_lower(StringRef("protobuf")) == 0 || Begin->compare_lower(StringRef("skia")) == 0 || Begin->compare_lower(StringRef("sfntly")) == 0 || diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build index 32e4b80c37bd..16e77b75185c 100644 --- a/dom/bindings/moz.build +++ b/dom/bindings/moz.build @@ -78,6 +78,7 @@ LOCAL_INCLUDES += [ '/dom/html', '/dom/indexedDB', '/dom/media/webaudio', + '/dom/media/webrtc/transport', '/dom/media/webspeech/recognition', '/dom/svg', '/dom/xml', @@ -89,7 +90,6 @@ LOCAL_INCLUDES += [ '/layout/generic', '/layout/style', '/layout/xul/tree', - '/media/mtransport', '/media/webrtc/', '/media/webrtc/signaling/src/common/time_profiling', '/media/webrtc/signaling/src/peerconnection', diff --git a/dom/media/MediaManager.h b/dom/media/MediaManager.h index 8c2385fe9d37..ee23c67bf97e 100644 --- a/dom/media/MediaManager.h +++ b/dom/media/MediaManager.h @@ -34,7 +34,7 @@ #include "DOMMediaStream.h" #ifdef MOZ_WEBRTC -# include "mtransport/runnable_utils.h" +# include "transport/runnable_utils.h" #endif class nsIPrefBranch; diff --git a/dom/media/MediaTrackGraph.cpp b/dom/media/MediaTrackGraph.cpp index 27274f5a257a..2fed693a4179 100644 --- a/dom/media/MediaTrackGraph.cpp +++ b/dom/media/MediaTrackGraph.cpp @@ -31,7 +31,7 @@ #include "mozilla/AbstractThread.h" #include "mozilla/StaticPrefs_dom.h" #include "mozilla/Unused.h" -#include "mtransport/runnable_utils.h" +#include "transport/runnable_utils.h" #include "VideoUtils.h" #include "GraphRunner.h" #include "Tracing.h" diff --git a/dom/media/bridge/components.conf b/dom/media/bridge/components.conf index 14b93269f42e..258d11175209 100644 --- a/dom/media/bridge/components.conf +++ b/dom/media/bridge/components.conf @@ -14,12 +14,12 @@ Classes = [ 'cid': '{9fea635a-2fc2-4d08-9721-d238d3f52f92}', 'contract_ids': ['@mozilla.org/network/tcp-filter-handler;1?name=stun'], 'type': 'nsStunTCPSocketFilterHandler', - 'headers': ['mtransport/stun_socket_filter.h'], + 'headers': ['transport/stun_socket_filter.h'], }, { 'cid': '{3e43ee93-829e-4ea6-a34e-62d9e4c9f993}', 'contract_ids': ['@mozilla.org/network/udp-filter-handler;1?name=stun'], 'type': 'nsStunUDPSocketFilterHandler', - 'headers': ['mtransport/stun_socket_filter.h'], + 'headers': ['transport/stun_socket_filter.h'], }, ] diff --git a/dom/media/bridge/moz.build b/dom/media/bridge/moz.build index 3b6cf5d6726a..b3a5b10eede5 100644 --- a/dom/media/bridge/moz.build +++ b/dom/media/bridge/moz.build @@ -15,9 +15,8 @@ SOURCES += [ ] LOCAL_INCLUDES += [ + '/dom/media/webrtc/transport', '/ipc/chromium/src', - '/media/mtransport', - '/media/mtransport', '/media/webrtc/', '/media/webrtc/signaling/src/common/time_profiling', '/media/webrtc/signaling/src/media-conduit', diff --git a/dom/media/gmp/moz.build b/dom/media/gmp/moz.build index f859650fc8ae..0741e9355d5b 100644 --- a/dom/media/gmp/moz.build +++ b/dom/media/gmp/moz.build @@ -140,9 +140,9 @@ if CONFIG['MOZ_SANDBOX']: FINAL_LIBRARY = 'xul' -# media/mtransport so we work with --disable-webrtc +# dom/media/webrtc/transport so we work with --disable-webrtc LOCAL_INCLUDES += [ - '/media/mtransport', + '/dom/media/webrtc/transport', '/xpcom/base', '/xpcom/build', '/xpcom/threads', diff --git a/dom/media/moz.build b/dom/media/moz.build index 530f57380b5c..a30e898ba922 100644 --- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -208,8 +208,8 @@ EXPORTS.mozilla.media.webrtc += [ ] if not CONFIG['MOZ_WEBRTC']: - EXPORTS.mtransport += [ - '../../media/mtransport/runnable_utils.h', + EXPORTS.transport += [ + 'webrtc/transport/runnable_utils.h', ] EXPORTS.mozilla.dom += [ diff --git a/dom/media/webrtc/MediaEngineWebRTCAudio.cpp b/dom/media/webrtc/MediaEngineWebRTCAudio.cpp index f62adf173654..9e5ce09a1f30 100644 --- a/dom/media/webrtc/MediaEngineWebRTCAudio.cpp +++ b/dom/media/webrtc/MediaEngineWebRTCAudio.cpp @@ -14,7 +14,7 @@ #include "MediaTrackConstraints.h" #include "mozilla/Assertions.h" #include "mozilla/ErrorNames.h" -#include "mtransport/runnable_utils.h" +#include "transport/runnable_utils.h" #include "Tracing.h" // scoped_ptr.h uses FF diff --git a/dom/media/webrtc/PMediaTransport.ipdl b/dom/media/webrtc/PMediaTransport.ipdl index 93edb5659f17..c95178d3e484 100644 --- a/dom/media/webrtc/PMediaTransport.ipdl +++ b/dom/media/webrtc/PMediaTransport.ipdl @@ -20,7 +20,7 @@ using mozilla::dom::RTCIceServer from "mozilla/dom/RTCConfigurationBinding.h"; using mozilla::dom::RTCIceTransportPolicy from "mozilla/dom/RTCConfigurationBinding.h"; // ParamTraits stuff for our own classes -using MediaPacket from "mtransport/mediapacket.h"; +using MediaPacket from "transport/mediapacket.h"; include "mozilla/net/NrIceStunAddrMessageUtils.h"; using net::NrIceStunAddrArray from "mozilla/net/PStunAddrsParams.h"; #endif // MOZ_WEBRTC diff --git a/dom/media/webrtc/RTCCertificate.cpp b/dom/media/webrtc/RTCCertificate.cpp index 8a59d83446a7..fcf51c975ce3 100644 --- a/dom/media/webrtc/RTCCertificate.cpp +++ b/dom/media/webrtc/RTCCertificate.cpp @@ -18,7 +18,7 @@ #include "mozilla/dom/StructuredCloneHolder.h" #include "mozilla/dom/WebCryptoCommon.h" #include "mozilla/dom/WebCryptoTask.h" -#include "mtransport/dtlsidentity.h" +#include "transport/dtlsidentity.h" namespace mozilla { namespace dom { diff --git a/dom/media/webrtc/WebrtcIPCTraits.h b/dom/media/webrtc/WebrtcIPCTraits.h index 0037b5c5780d..ec755cd2e449 100644 --- a/dom/media/webrtc/WebrtcIPCTraits.h +++ b/dom/media/webrtc/WebrtcIPCTraits.h @@ -11,7 +11,7 @@ #include "mozilla/media/webrtc/WebrtcGlobal.h" #include "mozilla/dom/CandidateInfo.h" #include "mozilla/MacroForEach.h" -#include "mtransport/dtlsidentity.h" +#include "transport/dtlsidentity.h" #include namespace mozilla { diff --git a/dom/media/webrtc/tests/fuzztests/moz.build b/dom/media/webrtc/tests/fuzztests/moz.build index 1d93344bfa76..eb4674cc0909 100644 --- a/dom/media/webrtc/tests/fuzztests/moz.build +++ b/dom/media/webrtc/tests/fuzztests/moz.build @@ -7,8 +7,8 @@ Library('FuzzingSdp') LOCAL_INCLUDES += [ + '/dom/media/webrtc/transport', '/ipc/chromium/src', - '/media/mtransport', '/media/webrtc/', '/media/webrtc/signaling/src/common/time_profiling', '/media/webrtc/signaling/src/peerconnection', diff --git a/media/mtransport/README b/dom/media/webrtc/transport/README similarity index 100% rename from media/mtransport/README rename to dom/media/webrtc/transport/README diff --git a/media/mtransport/SrtpFlow.cpp b/dom/media/webrtc/transport/SrtpFlow.cpp similarity index 100% rename from media/mtransport/SrtpFlow.cpp rename to dom/media/webrtc/transport/SrtpFlow.cpp diff --git a/media/mtransport/SrtpFlow.h b/dom/media/webrtc/transport/SrtpFlow.h similarity index 100% rename from media/mtransport/SrtpFlow.h rename to dom/media/webrtc/transport/SrtpFlow.h diff --git a/media/mtransport/WebrtcTCPSocketWrapper.cpp b/dom/media/webrtc/transport/WebrtcTCPSocketWrapper.cpp similarity index 100% rename from media/mtransport/WebrtcTCPSocketWrapper.cpp rename to dom/media/webrtc/transport/WebrtcTCPSocketWrapper.cpp diff --git a/media/mtransport/WebrtcTCPSocketWrapper.h b/dom/media/webrtc/transport/WebrtcTCPSocketWrapper.h similarity index 100% rename from media/mtransport/WebrtcTCPSocketWrapper.h rename to dom/media/webrtc/transport/WebrtcTCPSocketWrapper.h diff --git a/media/mtransport/build/moz.build b/dom/media/webrtc/transport/build/moz.build similarity index 96% rename from media/mtransport/build/moz.build rename to dom/media/webrtc/transport/build/moz.build index abd6ef4ff065..72b93ceec68b 100644 --- a/media/mtransport/build/moz.build +++ b/dom/media/webrtc/transport/build/moz.build @@ -6,7 +6,7 @@ include("/ipc/chromium/chromium-config.mozbuild") -EXPORTS.mtransport += [ +EXPORTS.transport += [ '../dtlsidentity.h', '../m_cpp_utils.h', '../mediapacket.h', @@ -39,6 +39,6 @@ include('/tools/fuzzing/libfuzzer-config.mozbuild') # getLogModule, UNIMPLEMENTED, nr_socket_long_term_violation_time, # nr_socket_short_term_violation_time, nrappkit/IPDL typedef conflicts in # PBrowserOrId and WebrtcTCPSocketChild. -SOURCES += mtransport_cppsrcs +SOURCES += transport_cppsrcs FINAL_LIBRARY = 'xul' diff --git a/media/mtransport/common.build b/dom/media/webrtc/transport/common.build similarity index 59% rename from media/mtransport/common.build rename to dom/media/webrtc/transport/common.build index e1b7a65537c8..28351219b3ec 100644 --- a/media/mtransport/common.build +++ b/dom/media/webrtc/transport/common.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -mtransport_lcppsrcs = [ +transport_lcppsrcs = [ 'dtlsidentity.cpp', 'mediapacket.cpp', 'nr_socket_proxy_config.cpp', @@ -32,26 +32,26 @@ mtransport_lcppsrcs = [ 'WebrtcTCPSocketWrapper.cpp', ] -mtransport_cppsrcs = [ - '/media/mtransport/%s' % s for s in sorted(mtransport_lcppsrcs) +transport_cppsrcs = [ + '/dom/media/webrtc/transport/%s' % s for s in sorted(transport_lcppsrcs) ] LOCAL_INCLUDES += [ - '/media/mtransport/', - '/media/mtransport/third_party/', - '/media/mtransport/third_party/nICEr/src/crypto', - '/media/mtransport/third_party/nICEr/src/ice', - '/media/mtransport/third_party/nICEr/src/net', - '/media/mtransport/third_party/nICEr/src/stun', - '/media/mtransport/third_party/nICEr/src/util', - '/media/mtransport/third_party/nrappkit/src/event', - '/media/mtransport/third_party/nrappkit/src/log', - '/media/mtransport/third_party/nrappkit/src/plugin', - '/media/mtransport/third_party/nrappkit/src/port/generic/include', - '/media/mtransport/third_party/nrappkit/src/registry', - '/media/mtransport/third_party/nrappkit/src/share', - '/media/mtransport/third_party/nrappkit/src/stats', - '/media/mtransport/third_party/nrappkit/src/util/libekr', + '/dom/media/webrtc/transport/', + '/dom/media/webrtc/transport/third_party/', + '/dom/media/webrtc/transport/third_party/nICEr/src/crypto', + '/dom/media/webrtc/transport/third_party/nICEr/src/ice', + '/dom/media/webrtc/transport/third_party/nICEr/src/net', + '/dom/media/webrtc/transport/third_party/nICEr/src/stun', + '/dom/media/webrtc/transport/third_party/nICEr/src/util', + '/dom/media/webrtc/transport/third_party/nrappkit/src/event', + '/dom/media/webrtc/transport/third_party/nrappkit/src/log', + '/dom/media/webrtc/transport/third_party/nrappkit/src/plugin', + '/dom/media/webrtc/transport/third_party/nrappkit/src/port/generic/include', + '/dom/media/webrtc/transport/third_party/nrappkit/src/registry', + '/dom/media/webrtc/transport/third_party/nrappkit/src/share', + '/dom/media/webrtc/transport/third_party/nrappkit/src/stats', + '/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr', '/netwerk/srtp/src/crypto/include', '/netwerk/srtp/src/include', ] @@ -62,25 +62,25 @@ if CONFIG['OS_TARGET'] in ['Darwin', 'DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD' else: DEFINES['BSD'] = True LOCAL_INCLUDES += [ - '/media/mtransport/third_party/nrappkit/src/port/darwin/include', + '/dom/media/webrtc/transport/third_party/nrappkit/src/port/darwin/include', ] elif CONFIG['OS_TARGET'] == 'Linux': DEFINES['LINUX'] = True LOCAL_INCLUDES += [ - '/media/mtransport/third_party/nrappkit/src/port/linux/include', + '/dom/media/webrtc/transport/third_party/nrappkit/src/port/linux/include', ] elif CONFIG['OS_TARGET'] == 'Android': DEFINES['LINUX'] = True DEFINES['ANDROID'] = True LOCAL_INCLUDES += [ - '/media/mtransport/third_party/nrappkit/src/port/android/include', + '/dom/media/webrtc/transport/third_party/nrappkit/src/port/android/include', ] elif CONFIG['OS_TARGET'] == 'WINNT': DEFINES['WIN'] = True # for stun.h DEFINES['WIN32'] = True LOCAL_INCLUDES += [ - '/media/mtransport/third_party/nrappkit/src/port/win32/include', + '/dom/media/webrtc/transport/third_party/nrappkit/src/port/win32/include', ] for var in ('HAVE_STRDUP', 'NR_SOCKET_IS_VOID_PTR'): diff --git a/media/mtransport/dtlsidentity.cpp b/dom/media/webrtc/transport/dtlsidentity.cpp similarity index 100% rename from media/mtransport/dtlsidentity.cpp rename to dom/media/webrtc/transport/dtlsidentity.cpp diff --git a/media/mtransport/dtlsidentity.h b/dom/media/webrtc/transport/dtlsidentity.h similarity index 100% rename from media/mtransport/dtlsidentity.h rename to dom/media/webrtc/transport/dtlsidentity.h diff --git a/dom/media/webrtc/transport/fuzztest/moz.build b/dom/media/webrtc/transport/fuzztest/moz.build new file mode 100644 index 000000000000..58732e8c4596 --- /dev/null +++ b/dom/media/webrtc/transport/fuzztest/moz.build @@ -0,0 +1,32 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +Library('FuzzingStun') + +DEFINES['HAVE_STRDUP'] = True + +LOCAL_INCLUDES += [ + '/dom/media/webrtc/transport', + '/dom/media/webrtc/transport/third_party/nICEr/src/net', + '/dom/media/webrtc/transport/third_party/nICEr/src/stun', + '/dom/media/webrtc/transport/third_party/nrappkit/src/event', + '/dom/media/webrtc/transport/third_party/nrappkit/src/log', + '/dom/media/webrtc/transport/third_party/nrappkit/src/plugin', + '/dom/media/webrtc/transport/third_party/nrappkit/src/port/darwin/include', + '/dom/media/webrtc/transport/third_party/nrappkit/src/share', + '/dom/media/webrtc/transport/third_party/nrappkit/src/stats', + '/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr', + '/ipc/chromium/src', +] + +# Add libFuzzer configuration directives +include('/tools/fuzzing/libfuzzer-config.mozbuild') + +SOURCES += [ + 'stun_parser_libfuzz.cpp', +] + +FINAL_LIBRARY = 'xul-gtest' diff --git a/media/mtransport/fuzztest/stun_parser_libfuzz.cpp b/dom/media/webrtc/transport/fuzztest/stun_parser_libfuzz.cpp similarity index 100% rename from media/mtransport/fuzztest/stun_parser_libfuzz.cpp rename to dom/media/webrtc/transport/fuzztest/stun_parser_libfuzz.cpp diff --git a/media/mtransport/ipc/NrIceStunAddrMessageUtils.h b/dom/media/webrtc/transport/ipc/NrIceStunAddrMessageUtils.h similarity index 97% rename from media/mtransport/ipc/NrIceStunAddrMessageUtils.h rename to dom/media/webrtc/transport/ipc/NrIceStunAddrMessageUtils.h index 18578fecb7c2..b45845df5253 100644 --- a/media/mtransport/ipc/NrIceStunAddrMessageUtils.h +++ b/dom/media/webrtc/transport/ipc/NrIceStunAddrMessageUtils.h @@ -13,7 +13,7 @@ class NrIceStunAddr; #include "ipc/IPCMessageUtils.h" #ifdef MOZ_WEBRTC -# include "mtransport/nricestunaddr.h" +# include "transport/nricestunaddr.h" #endif namespace IPC { diff --git a/media/mtransport/ipc/PStunAddrsParams.h b/dom/media/webrtc/transport/ipc/PStunAddrsParams.h similarity index 95% rename from media/mtransport/ipc/PStunAddrsParams.h rename to dom/media/webrtc/transport/ipc/PStunAddrsParams.h index 9ff687dfccfd..315925609d4e 100644 --- a/media/mtransport/ipc/PStunAddrsParams.h +++ b/dom/media/webrtc/transport/ipc/PStunAddrsParams.h @@ -9,7 +9,7 @@ #include "nsTArray.h" #ifdef MOZ_WEBRTC -# include "mtransport/nricestunaddr.h" +# include "transport/nricestunaddr.h" #endif namespace mozilla { diff --git a/media/mtransport/ipc/PStunAddrsRequest.ipdl b/dom/media/webrtc/transport/ipc/PStunAddrsRequest.ipdl similarity index 100% rename from media/mtransport/ipc/PStunAddrsRequest.ipdl rename to dom/media/webrtc/transport/ipc/PStunAddrsRequest.ipdl diff --git a/media/mtransport/ipc/PWebrtcTCPSocket.ipdl b/dom/media/webrtc/transport/ipc/PWebrtcTCPSocket.ipdl similarity index 100% rename from media/mtransport/ipc/PWebrtcTCPSocket.ipdl rename to dom/media/webrtc/transport/ipc/PWebrtcTCPSocket.ipdl diff --git a/media/mtransport/ipc/StunAddrsRequestChild.cpp b/dom/media/webrtc/transport/ipc/StunAddrsRequestChild.cpp similarity index 100% rename from media/mtransport/ipc/StunAddrsRequestChild.cpp rename to dom/media/webrtc/transport/ipc/StunAddrsRequestChild.cpp diff --git a/media/mtransport/ipc/StunAddrsRequestChild.h b/dom/media/webrtc/transport/ipc/StunAddrsRequestChild.h similarity index 100% rename from media/mtransport/ipc/StunAddrsRequestChild.h rename to dom/media/webrtc/transport/ipc/StunAddrsRequestChild.h diff --git a/media/mtransport/ipc/StunAddrsRequestParent.cpp b/dom/media/webrtc/transport/ipc/StunAddrsRequestParent.cpp similarity index 98% rename from media/mtransport/ipc/StunAddrsRequestParent.cpp rename to dom/media/webrtc/transport/ipc/StunAddrsRequestParent.cpp index 2e1095da1edc..b6337c50ef19 100644 --- a/media/mtransport/ipc/StunAddrsRequestParent.cpp +++ b/dom/media/webrtc/transport/ipc/StunAddrsRequestParent.cpp @@ -7,9 +7,9 @@ #include "../runnable_utils.h" #include "nsNetUtil.h" -#include "mtransport/nricectx.h" -#include "mtransport/nricemediastream.h" // needed only for including nricectx.h -#include "mtransport/nricestunaddr.h" +#include "transport/nricectx.h" +#include "transport/nricemediastream.h" // needed only for including nricectx.h +#include "transport/nricestunaddr.h" #include "../mdns_service/mdns_service.h" diff --git a/media/mtransport/ipc/StunAddrsRequestParent.h b/dom/media/webrtc/transport/ipc/StunAddrsRequestParent.h similarity index 100% rename from media/mtransport/ipc/StunAddrsRequestParent.h rename to dom/media/webrtc/transport/ipc/StunAddrsRequestParent.h diff --git a/media/mtransport/ipc/WebrtcProxyConfig.ipdlh b/dom/media/webrtc/transport/ipc/WebrtcProxyConfig.ipdlh similarity index 100% rename from media/mtransport/ipc/WebrtcProxyConfig.ipdlh rename to dom/media/webrtc/transport/ipc/WebrtcProxyConfig.ipdlh diff --git a/media/mtransport/ipc/WebrtcTCPSocket.cpp b/dom/media/webrtc/transport/ipc/WebrtcTCPSocket.cpp similarity index 100% rename from media/mtransport/ipc/WebrtcTCPSocket.cpp rename to dom/media/webrtc/transport/ipc/WebrtcTCPSocket.cpp diff --git a/media/mtransport/ipc/WebrtcTCPSocket.h b/dom/media/webrtc/transport/ipc/WebrtcTCPSocket.h similarity index 100% rename from media/mtransport/ipc/WebrtcTCPSocket.h rename to dom/media/webrtc/transport/ipc/WebrtcTCPSocket.h diff --git a/media/mtransport/ipc/WebrtcTCPSocketCallback.h b/dom/media/webrtc/transport/ipc/WebrtcTCPSocketCallback.h similarity index 100% rename from media/mtransport/ipc/WebrtcTCPSocketCallback.h rename to dom/media/webrtc/transport/ipc/WebrtcTCPSocketCallback.h diff --git a/media/mtransport/ipc/WebrtcTCPSocketChild.cpp b/dom/media/webrtc/transport/ipc/WebrtcTCPSocketChild.cpp similarity index 100% rename from media/mtransport/ipc/WebrtcTCPSocketChild.cpp rename to dom/media/webrtc/transport/ipc/WebrtcTCPSocketChild.cpp diff --git a/media/mtransport/ipc/WebrtcTCPSocketChild.h b/dom/media/webrtc/transport/ipc/WebrtcTCPSocketChild.h similarity index 97% rename from media/mtransport/ipc/WebrtcTCPSocketChild.h rename to dom/media/webrtc/transport/ipc/WebrtcTCPSocketChild.h index cee735226031..deff56897b52 100644 --- a/media/mtransport/ipc/WebrtcTCPSocketChild.h +++ b/dom/media/webrtc/transport/ipc/WebrtcTCPSocketChild.h @@ -9,7 +9,7 @@ #include "mozilla/net/PWebrtcTCPSocketChild.h" #include "mozilla/dom/ipc/IdType.h" -#include "mtransport/nr_socket_proxy_config.h" +#include "transport/nr_socket_proxy_config.h" namespace mozilla { diff --git a/media/mtransport/ipc/WebrtcTCPSocketLog.cpp b/dom/media/webrtc/transport/ipc/WebrtcTCPSocketLog.cpp similarity index 100% rename from media/mtransport/ipc/WebrtcTCPSocketLog.cpp rename to dom/media/webrtc/transport/ipc/WebrtcTCPSocketLog.cpp diff --git a/media/mtransport/ipc/WebrtcTCPSocketLog.h b/dom/media/webrtc/transport/ipc/WebrtcTCPSocketLog.h similarity index 100% rename from media/mtransport/ipc/WebrtcTCPSocketLog.h rename to dom/media/webrtc/transport/ipc/WebrtcTCPSocketLog.h diff --git a/media/mtransport/ipc/WebrtcTCPSocketParent.cpp b/dom/media/webrtc/transport/ipc/WebrtcTCPSocketParent.cpp similarity index 100% rename from media/mtransport/ipc/WebrtcTCPSocketParent.cpp rename to dom/media/webrtc/transport/ipc/WebrtcTCPSocketParent.cpp diff --git a/media/mtransport/ipc/WebrtcTCPSocketParent.h b/dom/media/webrtc/transport/ipc/WebrtcTCPSocketParent.h similarity index 100% rename from media/mtransport/ipc/WebrtcTCPSocketParent.h rename to dom/media/webrtc/transport/ipc/WebrtcTCPSocketParent.h diff --git a/media/mtransport/ipc/moz.build b/dom/media/webrtc/transport/ipc/moz.build similarity index 92% rename from media/mtransport/ipc/moz.build rename to dom/media/webrtc/transport/ipc/moz.build index 87b54b745308..cb632852f54c 100644 --- a/media/mtransport/ipc/moz.build +++ b/dom/media/webrtc/transport/ipc/moz.build @@ -45,8 +45,8 @@ DEFINES['R_DEFINED_INT8'] = 'int8_t' DEFINES['R_DEFINED_UINT8'] = 'uint8_t' LOCAL_INCLUDES += [ - '/media/mtransport/third_party/nICEr/src/net', - '/media/mtransport/third_party/nrappkit/src/util/libekr', + '/dom/media/webrtc/transport/third_party/nICEr/src/net', + '/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr', '/media/webrtc', '/media/webrtc/signaling/src/peerconnection', '/netwerk/base', diff --git a/media/mtransport/logging.h b/dom/media/webrtc/transport/logging.h similarity index 100% rename from media/mtransport/logging.h rename to dom/media/webrtc/transport/logging.h diff --git a/media/mtransport/m_cpp_utils.h b/dom/media/webrtc/transport/m_cpp_utils.h similarity index 100% rename from media/mtransport/m_cpp_utils.h rename to dom/media/webrtc/transport/m_cpp_utils.h diff --git a/media/mtransport/mdns_service/Cargo.toml b/dom/media/webrtc/transport/mdns_service/Cargo.toml similarity index 100% rename from media/mtransport/mdns_service/Cargo.toml rename to dom/media/webrtc/transport/mdns_service/Cargo.toml diff --git a/media/mtransport/mdns_service/mdns_service.h b/dom/media/webrtc/transport/mdns_service/mdns_service.h similarity index 100% rename from media/mtransport/mdns_service/mdns_service.h rename to dom/media/webrtc/transport/mdns_service/mdns_service.h diff --git a/media/mtransport/mdns_service/src/lib.rs b/dom/media/webrtc/transport/mdns_service/src/lib.rs similarity index 100% rename from media/mtransport/mdns_service/src/lib.rs rename to dom/media/webrtc/transport/mdns_service/src/lib.rs diff --git a/media/mtransport/mediapacket.cpp b/dom/media/webrtc/transport/mediapacket.cpp similarity index 100% rename from media/mtransport/mediapacket.cpp rename to dom/media/webrtc/transport/mediapacket.cpp diff --git a/media/mtransport/mediapacket.h b/dom/media/webrtc/transport/mediapacket.h similarity index 100% rename from media/mtransport/mediapacket.h rename to dom/media/webrtc/transport/mediapacket.h diff --git a/media/mtransport/moz.build b/dom/media/webrtc/transport/moz.build similarity index 82% rename from media/mtransport/moz.build rename to dom/media/webrtc/transport/moz.build index fcdb47bc1d7e..82ff399a43fc 100644 --- a/media/mtransport/moz.build +++ b/dom/media/webrtc/transport/moz.build @@ -10,9 +10,9 @@ with Files("**"): include("/ipc/chromium/chromium-config.mozbuild") DIRS += [ - '/media/mtransport/third_party', - '/media/mtransport/build', - '/media/mtransport/ipc', + '/dom/media/webrtc/transport/third_party', + '/dom/media/webrtc/transport/build', + '/dom/media/webrtc/transport/ipc', ] # Add libFuzzer configuration directives diff --git a/media/mtransport/nr_socket_proxy_config.cpp b/dom/media/webrtc/transport/nr_socket_proxy_config.cpp similarity index 100% rename from media/mtransport/nr_socket_proxy_config.cpp rename to dom/media/webrtc/transport/nr_socket_proxy_config.cpp diff --git a/media/mtransport/nr_socket_proxy_config.h b/dom/media/webrtc/transport/nr_socket_proxy_config.h similarity index 100% rename from media/mtransport/nr_socket_proxy_config.h rename to dom/media/webrtc/transport/nr_socket_proxy_config.h diff --git a/media/mtransport/nr_socket_prsock.cpp b/dom/media/webrtc/transport/nr_socket_prsock.cpp similarity index 100% rename from media/mtransport/nr_socket_prsock.cpp rename to dom/media/webrtc/transport/nr_socket_prsock.cpp diff --git a/media/mtransport/nr_socket_prsock.h b/dom/media/webrtc/transport/nr_socket_prsock.h similarity index 100% rename from media/mtransport/nr_socket_prsock.h rename to dom/media/webrtc/transport/nr_socket_prsock.h diff --git a/media/mtransport/nr_socket_tcp.cpp b/dom/media/webrtc/transport/nr_socket_tcp.cpp similarity index 100% rename from media/mtransport/nr_socket_tcp.cpp rename to dom/media/webrtc/transport/nr_socket_tcp.cpp diff --git a/media/mtransport/nr_socket_tcp.h b/dom/media/webrtc/transport/nr_socket_tcp.h similarity index 100% rename from media/mtransport/nr_socket_tcp.h rename to dom/media/webrtc/transport/nr_socket_tcp.h diff --git a/media/mtransport/nr_timer.cpp b/dom/media/webrtc/transport/nr_timer.cpp similarity index 100% rename from media/mtransport/nr_timer.cpp rename to dom/media/webrtc/transport/nr_timer.cpp diff --git a/media/mtransport/nricectx.cpp b/dom/media/webrtc/transport/nricectx.cpp similarity index 100% rename from media/mtransport/nricectx.cpp rename to dom/media/webrtc/transport/nricectx.cpp diff --git a/media/mtransport/nricectx.h b/dom/media/webrtc/transport/nricectx.h similarity index 100% rename from media/mtransport/nricectx.h rename to dom/media/webrtc/transport/nricectx.h diff --git a/media/mtransport/nricemediastream.cpp b/dom/media/webrtc/transport/nricemediastream.cpp similarity index 100% rename from media/mtransport/nricemediastream.cpp rename to dom/media/webrtc/transport/nricemediastream.cpp diff --git a/media/mtransport/nricemediastream.h b/dom/media/webrtc/transport/nricemediastream.h similarity index 100% rename from media/mtransport/nricemediastream.h rename to dom/media/webrtc/transport/nricemediastream.h diff --git a/media/mtransport/nriceresolver.cpp b/dom/media/webrtc/transport/nriceresolver.cpp similarity index 99% rename from media/mtransport/nriceresolver.cpp rename to dom/media/webrtc/transport/nriceresolver.cpp index 8142737ac1eb..64acb1f60e3a 100644 --- a/media/mtransport/nriceresolver.cpp +++ b/dom/media/webrtc/transport/nriceresolver.cpp @@ -63,7 +63,7 @@ extern "C" { #include "nsCOMPtr.h" #include "nriceresolver.h" #include "nr_socket_prsock.h" -#include "mtransport/runnable_utils.h" +#include "transport/runnable_utils.h" namespace mozilla { diff --git a/media/mtransport/nriceresolver.h b/dom/media/webrtc/transport/nriceresolver.h similarity index 100% rename from media/mtransport/nriceresolver.h rename to dom/media/webrtc/transport/nriceresolver.h diff --git a/media/mtransport/nriceresolverfake.cpp b/dom/media/webrtc/transport/nriceresolverfake.cpp similarity index 100% rename from media/mtransport/nriceresolverfake.cpp rename to dom/media/webrtc/transport/nriceresolverfake.cpp diff --git a/media/mtransport/nriceresolverfake.h b/dom/media/webrtc/transport/nriceresolverfake.h similarity index 100% rename from media/mtransport/nriceresolverfake.h rename to dom/media/webrtc/transport/nriceresolverfake.h diff --git a/media/mtransport/nricestunaddr.cpp b/dom/media/webrtc/transport/nricestunaddr.cpp similarity index 100% rename from media/mtransport/nricestunaddr.cpp rename to dom/media/webrtc/transport/nricestunaddr.cpp diff --git a/media/mtransport/nricestunaddr.h b/dom/media/webrtc/transport/nricestunaddr.h similarity index 93% rename from media/mtransport/nricestunaddr.h rename to dom/media/webrtc/transport/nricestunaddr.h index a415e1a6bf41..8ebcdd6fe70a 100644 --- a/media/mtransport/nricestunaddr.h +++ b/dom/media/webrtc/transport/nricestunaddr.h @@ -22,7 +22,7 @@ class NrIceStunAddr { const nr_local_addr& localAddr() const { return *localAddr_; } // serialization/deserialization helper functions for use - // in media/mtransport/ipc/NrIceStunAddrMessagUtils.h + // in dom/media/webrtc/transport/ipc/NrIceStunAddrMessagUtils.h size_t SerializationBufferSize() const; nsresult Serialize(char* buffer, size_t buffer_size) const; nsresult Deserialize(const char* buffer, size_t buffer_size); diff --git a/media/mtransport/nrinterfaceprioritizer.cpp b/dom/media/webrtc/transport/nrinterfaceprioritizer.cpp similarity index 100% rename from media/mtransport/nrinterfaceprioritizer.cpp rename to dom/media/webrtc/transport/nrinterfaceprioritizer.cpp diff --git a/media/mtransport/nrinterfaceprioritizer.h b/dom/media/webrtc/transport/nrinterfaceprioritizer.h similarity index 100% rename from media/mtransport/nrinterfaceprioritizer.h rename to dom/media/webrtc/transport/nrinterfaceprioritizer.h diff --git a/media/mtransport/rlogconnector.cpp b/dom/media/webrtc/transport/rlogconnector.cpp similarity index 100% rename from media/mtransport/rlogconnector.cpp rename to dom/media/webrtc/transport/rlogconnector.cpp diff --git a/media/mtransport/rlogconnector.h b/dom/media/webrtc/transport/rlogconnector.h similarity index 100% rename from media/mtransport/rlogconnector.h rename to dom/media/webrtc/transport/rlogconnector.h diff --git a/media/mtransport/runnable_utils.h b/dom/media/webrtc/transport/runnable_utils.h similarity index 100% rename from media/mtransport/runnable_utils.h rename to dom/media/webrtc/transport/runnable_utils.h diff --git a/media/mtransport/sigslot.h b/dom/media/webrtc/transport/sigslot.h similarity index 100% rename from media/mtransport/sigslot.h rename to dom/media/webrtc/transport/sigslot.h diff --git a/media/mtransport/simpletokenbucket.cpp b/dom/media/webrtc/transport/simpletokenbucket.cpp similarity index 100% rename from media/mtransport/simpletokenbucket.cpp rename to dom/media/webrtc/transport/simpletokenbucket.cpp diff --git a/media/mtransport/simpletokenbucket.h b/dom/media/webrtc/transport/simpletokenbucket.h similarity index 100% rename from media/mtransport/simpletokenbucket.h rename to dom/media/webrtc/transport/simpletokenbucket.h diff --git a/media/mtransport/stun_socket_filter.cpp b/dom/media/webrtc/transport/stun_socket_filter.cpp similarity index 100% rename from media/mtransport/stun_socket_filter.cpp rename to dom/media/webrtc/transport/stun_socket_filter.cpp diff --git a/media/mtransport/stun_socket_filter.h b/dom/media/webrtc/transport/stun_socket_filter.h similarity index 100% rename from media/mtransport/stun_socket_filter.h rename to dom/media/webrtc/transport/stun_socket_filter.h diff --git a/media/mtransport/test/TestSyncRunnable.cpp b/dom/media/webrtc/transport/test/TestSyncRunnable.cpp similarity index 100% rename from media/mtransport/test/TestSyncRunnable.cpp rename to dom/media/webrtc/transport/test/TestSyncRunnable.cpp diff --git a/media/mtransport/test/buffered_stun_socket_unittest.cpp b/dom/media/webrtc/transport/test/buffered_stun_socket_unittest.cpp similarity index 100% rename from media/mtransport/test/buffered_stun_socket_unittest.cpp rename to dom/media/webrtc/transport/test/buffered_stun_socket_unittest.cpp diff --git a/media/mtransport/test/dummysocket.h b/dom/media/webrtc/transport/test/dummysocket.h similarity index 100% rename from media/mtransport/test/dummysocket.h rename to dom/media/webrtc/transport/test/dummysocket.h diff --git a/media/mtransport/test/gtest_ringbuffer_dumper.h b/dom/media/webrtc/transport/test/gtest_ringbuffer_dumper.h similarity index 100% rename from media/mtransport/test/gtest_ringbuffer_dumper.h rename to dom/media/webrtc/transport/test/gtest_ringbuffer_dumper.h diff --git a/media/mtransport/test/gtest_utils.h b/dom/media/webrtc/transport/test/gtest_utils.h similarity index 100% rename from media/mtransport/test/gtest_utils.h rename to dom/media/webrtc/transport/test/gtest_utils.h diff --git a/media/mtransport/test/ice_unittest.cpp b/dom/media/webrtc/transport/test/ice_unittest.cpp similarity index 100% rename from media/mtransport/test/ice_unittest.cpp rename to dom/media/webrtc/transport/test/ice_unittest.cpp diff --git a/media/mtransport/test/moz.build b/dom/media/webrtc/transport/test/moz.build similarity index 63% rename from media/mtransport/test/moz.build rename to dom/media/webrtc/transport/test/moz.build index be0c307da9fb..7fab8c1815a4 100644 --- a/media/mtransport/test/moz.build +++ b/dom/media/webrtc/transport/test/moz.build @@ -44,18 +44,18 @@ if CONFIG['OS_TARGET'] == 'Android': DEFINES['LINUX'] = True DEFINES['ANDROID'] = True LOCAL_INCLUDES += [ - '/media/mtransport/third_party/nrappkit/src/port/android/include', + '/dom/media/webrtc/transport/third_party/nrappkit/src/port/android/include', ] if CONFIG['OS_TARGET'] == 'Linux': DEFINES['LINUX'] = True LOCAL_INCLUDES += [ - '/media/mtransport/third_party/nrappkit/src/port/linux/include', + '/dom/media/webrtc/transport/third_party/nrappkit/src/port/linux/include', ] if CONFIG['OS_TARGET'] == 'Darwin': LOCAL_INCLUDES += [ - '/media/mtransport/third_party/nrappkit/src/port/darwin/include', + '/dom/media/webrtc/transport/third_party/nrappkit/src/port/darwin/include', ] if CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'): @@ -64,7 +64,7 @@ if CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'): else: DEFINES['BSD'] = True LOCAL_INCLUDES += [ - '/media/mtransport/third_party/nrappkit/src/port/darwin/include', + '/dom/media/webrtc/transport/third_party/nrappkit/src/port/darwin/include', ] # SCTP DEFINES @@ -81,22 +81,22 @@ if CONFIG['OS_TARGET'] in ('Darwin', 'Android'): DEFINES['GTEST_USE_OWN_TR1_TUPLE'] = 1 LOCAL_INCLUDES += [ - '/media/mtransport/', - '/media/mtransport/third_party/', - '/media/mtransport/third_party/nICEr/src/crypto', - '/media/mtransport/third_party/nICEr/src/ice', - '/media/mtransport/third_party/nICEr/src/net', - '/media/mtransport/third_party/nICEr/src/stun', - '/media/mtransport/third_party/nICEr/src/util', - '/media/mtransport/third_party/nrappkit/src/event', - '/media/mtransport/third_party/nrappkit/src/log', - '/media/mtransport/third_party/nrappkit/src/plugin', - '/media/mtransport/third_party/nrappkit/src/port/generic/include', - '/media/mtransport/third_party/nrappkit/src/registry', - '/media/mtransport/third_party/nrappkit/src/share', - '/media/mtransport/third_party/nrappkit/src/stats', - '/media/mtransport/third_party/nrappkit/src/util/', - '/media/mtransport/third_party/nrappkit/src/util/libekr', + '/dom/media/webrtc/transport/', + '/dom/media/webrtc/transport/third_party/', + '/dom/media/webrtc/transport/third_party/nICEr/src/crypto', + '/dom/media/webrtc/transport/third_party/nICEr/src/ice', + '/dom/media/webrtc/transport/third_party/nICEr/src/net', + '/dom/media/webrtc/transport/third_party/nICEr/src/stun', + '/dom/media/webrtc/transport/third_party/nICEr/src/util', + '/dom/media/webrtc/transport/third_party/nrappkit/src/event', + '/dom/media/webrtc/transport/third_party/nrappkit/src/log', + '/dom/media/webrtc/transport/third_party/nrappkit/src/plugin', + '/dom/media/webrtc/transport/third_party/nrappkit/src/port/generic/include', + '/dom/media/webrtc/transport/third_party/nrappkit/src/registry', + '/dom/media/webrtc/transport/third_party/nrappkit/src/share', + '/dom/media/webrtc/transport/third_party/nrappkit/src/stats', + '/dom/media/webrtc/transport/third_party/nrappkit/src/util/', + '/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr', '/netwerk/sctp/src/', '/xpcom/tests/' ] diff --git a/media/mtransport/test/mtransport_test_utils.h b/dom/media/webrtc/transport/test/mtransport_test_utils.h similarity index 100% rename from media/mtransport/test/mtransport_test_utils.h rename to dom/media/webrtc/transport/test/mtransport_test_utils.h diff --git a/media/mtransport/test/multi_tcp_socket_unittest.cpp b/dom/media/webrtc/transport/test/multi_tcp_socket_unittest.cpp similarity index 100% rename from media/mtransport/test/multi_tcp_socket_unittest.cpp rename to dom/media/webrtc/transport/test/multi_tcp_socket_unittest.cpp diff --git a/media/mtransport/test/nrappkit_unittest.cpp b/dom/media/webrtc/transport/test/nrappkit_unittest.cpp similarity index 100% rename from media/mtransport/test/nrappkit_unittest.cpp rename to dom/media/webrtc/transport/test/nrappkit_unittest.cpp diff --git a/media/mtransport/test/proxy_tunnel_socket_unittest.cpp b/dom/media/webrtc/transport/test/proxy_tunnel_socket_unittest.cpp similarity index 100% rename from media/mtransport/test/proxy_tunnel_socket_unittest.cpp rename to dom/media/webrtc/transport/test/proxy_tunnel_socket_unittest.cpp diff --git a/media/mtransport/test/rlogconnector_unittest.cpp b/dom/media/webrtc/transport/test/rlogconnector_unittest.cpp similarity index 100% rename from media/mtransport/test/rlogconnector_unittest.cpp rename to dom/media/webrtc/transport/test/rlogconnector_unittest.cpp diff --git a/media/mtransport/test/runnable_utils_unittest.cpp b/dom/media/webrtc/transport/test/runnable_utils_unittest.cpp similarity index 100% rename from media/mtransport/test/runnable_utils_unittest.cpp rename to dom/media/webrtc/transport/test/runnable_utils_unittest.cpp diff --git a/media/mtransport/test/sctp_unittest.cpp b/dom/media/webrtc/transport/test/sctp_unittest.cpp similarity index 100% rename from media/mtransport/test/sctp_unittest.cpp rename to dom/media/webrtc/transport/test/sctp_unittest.cpp diff --git a/media/mtransport/test/simpletokenbucket_unittest.cpp b/dom/media/webrtc/transport/test/simpletokenbucket_unittest.cpp similarity index 100% rename from media/mtransport/test/simpletokenbucket_unittest.cpp rename to dom/media/webrtc/transport/test/simpletokenbucket_unittest.cpp diff --git a/media/mtransport/test/sockettransportservice_unittest.cpp b/dom/media/webrtc/transport/test/sockettransportservice_unittest.cpp similarity index 100% rename from media/mtransport/test/sockettransportservice_unittest.cpp rename to dom/media/webrtc/transport/test/sockettransportservice_unittest.cpp diff --git a/media/mtransport/test/stunserver.cpp b/dom/media/webrtc/transport/test/stunserver.cpp similarity index 100% rename from media/mtransport/test/stunserver.cpp rename to dom/media/webrtc/transport/test/stunserver.cpp diff --git a/media/mtransport/test/stunserver.h b/dom/media/webrtc/transport/test/stunserver.h similarity index 100% rename from media/mtransport/test/stunserver.h rename to dom/media/webrtc/transport/test/stunserver.h diff --git a/media/mtransport/test/test_nr_socket_ice_unittest.cpp b/dom/media/webrtc/transport/test/test_nr_socket_ice_unittest.cpp similarity index 100% rename from media/mtransport/test/test_nr_socket_ice_unittest.cpp rename to dom/media/webrtc/transport/test/test_nr_socket_ice_unittest.cpp diff --git a/media/mtransport/test/test_nr_socket_unittest.cpp b/dom/media/webrtc/transport/test/test_nr_socket_unittest.cpp similarity index 100% rename from media/mtransport/test/test_nr_socket_unittest.cpp rename to dom/media/webrtc/transport/test/test_nr_socket_unittest.cpp diff --git a/media/mtransport/test/transport_unittests.cpp b/dom/media/webrtc/transport/test/transport_unittests.cpp similarity index 100% rename from media/mtransport/test/transport_unittests.cpp rename to dom/media/webrtc/transport/test/transport_unittests.cpp diff --git a/media/mtransport/test/turn_unittest.cpp b/dom/media/webrtc/transport/test/turn_unittest.cpp similarity index 100% rename from media/mtransport/test/turn_unittest.cpp rename to dom/media/webrtc/transport/test/turn_unittest.cpp diff --git a/media/mtransport/test/webrtcproxychannel_unittest.cpp b/dom/media/webrtc/transport/test/webrtcproxychannel_unittest.cpp similarity index 100% rename from media/mtransport/test/webrtcproxychannel_unittest.cpp rename to dom/media/webrtc/transport/test/webrtcproxychannel_unittest.cpp diff --git a/media/mtransport/test_nr_socket.cpp b/dom/media/webrtc/transport/test_nr_socket.cpp similarity index 100% rename from media/mtransport/test_nr_socket.cpp rename to dom/media/webrtc/transport/test_nr_socket.cpp diff --git a/media/mtransport/test_nr_socket.h b/dom/media/webrtc/transport/test_nr_socket.h similarity index 100% rename from media/mtransport/test_nr_socket.h rename to dom/media/webrtc/transport/test_nr_socket.h diff --git a/media/mtransport/third_party/import.py b/dom/media/webrtc/transport/third_party/import.py similarity index 100% rename from media/mtransport/third_party/import.py rename to dom/media/webrtc/transport/third_party/import.py diff --git a/media/mtransport/third_party/moz.build b/dom/media/webrtc/transport/third_party/moz.build similarity index 100% rename from media/mtransport/third_party/moz.build rename to dom/media/webrtc/transport/third_party/moz.build diff --git a/media/mtransport/third_party/nICEr/IMPORT_FILES b/dom/media/webrtc/transport/third_party/nICEr/IMPORT_FILES similarity index 100% rename from media/mtransport/third_party/nICEr/IMPORT_FILES rename to dom/media/webrtc/transport/third_party/nICEr/IMPORT_FILES diff --git a/media/mtransport/third_party/nICEr/README b/dom/media/webrtc/transport/third_party/nICEr/README similarity index 100% rename from media/mtransport/third_party/nICEr/README rename to dom/media/webrtc/transport/third_party/nICEr/README diff --git a/media/mtransport/third_party/nICEr/README_MOZILLA b/dom/media/webrtc/transport/third_party/nICEr/README_MOZILLA similarity index 100% rename from media/mtransport/third_party/nICEr/README_MOZILLA rename to dom/media/webrtc/transport/third_party/nICEr/README_MOZILLA diff --git a/media/mtransport/third_party/nICEr/nicer.gyp b/dom/media/webrtc/transport/third_party/nICEr/nicer.gyp similarity index 100% rename from media/mtransport/third_party/nICEr/nicer.gyp rename to dom/media/webrtc/transport/third_party/nICEr/nicer.gyp diff --git a/media/mtransport/third_party/nICEr/src/crypto/nr_crypto.c b/dom/media/webrtc/transport/third_party/nICEr/src/crypto/nr_crypto.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/crypto/nr_crypto.c rename to dom/media/webrtc/transport/third_party/nICEr/src/crypto/nr_crypto.c diff --git a/media/mtransport/third_party/nICEr/src/crypto/nr_crypto.h b/dom/media/webrtc/transport/third_party/nICEr/src/crypto/nr_crypto.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/crypto/nr_crypto.h rename to dom/media/webrtc/transport/third_party/nICEr/src/crypto/nr_crypto.h diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_candidate.c b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_candidate.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_candidate.c rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_candidate.c diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_candidate.h b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_candidate.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_candidate.h rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_candidate.h diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_candidate_pair.c b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_candidate_pair.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_candidate_pair.c rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_candidate_pair.c diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_candidate_pair.h b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_candidate_pair.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_candidate_pair.h rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_candidate_pair.h diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_codeword.h b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_codeword.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_codeword.h rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_codeword.h diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_component.c b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_component.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_component.c rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_component.c diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_component.h b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_component.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_component.h rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_component.h diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_ctx.c b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_ctx.c rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.c diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_ctx.h b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_ctx.h rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.h diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_handler.h b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_handler.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_handler.h rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_handler.h diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_media_stream.c b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_media_stream.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_media_stream.c rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_media_stream.c diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_media_stream.h b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_media_stream.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_media_stream.h rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_media_stream.h diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_parser.c b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_parser.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_parser.c rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_parser.c diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.c b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_peer_ctx.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.c rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_peer_ctx.c diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.h b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_peer_ctx.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.h rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_peer_ctx.h diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_reg.h b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_reg.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_reg.h rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_reg.h diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_socket.c b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_socket.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_socket.c rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_socket.c diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_socket.h b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_socket.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/ice/ice_socket.h rename to dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_socket.h diff --git a/media/mtransport/third_party/nICEr/src/net/local_addr.c b/dom/media/webrtc/transport/third_party/nICEr/src/net/local_addr.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/local_addr.c rename to dom/media/webrtc/transport/third_party/nICEr/src/net/local_addr.c diff --git a/media/mtransport/third_party/nICEr/src/net/local_addr.h b/dom/media/webrtc/transport/third_party/nICEr/src/net/local_addr.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/local_addr.h rename to dom/media/webrtc/transport/third_party/nICEr/src/net/local_addr.h diff --git a/media/mtransport/third_party/nICEr/src/net/nr_interface_prioritizer.c b/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_interface_prioritizer.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/nr_interface_prioritizer.c rename to dom/media/webrtc/transport/third_party/nICEr/src/net/nr_interface_prioritizer.c diff --git a/media/mtransport/third_party/nICEr/src/net/nr_interface_prioritizer.h b/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_interface_prioritizer.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/nr_interface_prioritizer.h rename to dom/media/webrtc/transport/third_party/nICEr/src/net/nr_interface_prioritizer.h diff --git a/media/mtransport/third_party/nICEr/src/net/nr_resolver.c b/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_resolver.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/nr_resolver.c rename to dom/media/webrtc/transport/third_party/nICEr/src/net/nr_resolver.c diff --git a/media/mtransport/third_party/nICEr/src/net/nr_resolver.h b/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_resolver.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/nr_resolver.h rename to dom/media/webrtc/transport/third_party/nICEr/src/net/nr_resolver.h diff --git a/media/mtransport/third_party/nICEr/src/net/nr_socket.c b/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/nr_socket.c rename to dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket.c diff --git a/media/mtransport/third_party/nICEr/src/net/nr_socket.h b/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/nr_socket.h rename to dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket.h diff --git a/media/mtransport/third_party/nICEr/src/net/nr_socket_local.h b/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_local.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/nr_socket_local.h rename to dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_local.h diff --git a/media/mtransport/third_party/nICEr/src/net/nr_socket_multi_tcp.c b/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_multi_tcp.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/nr_socket_multi_tcp.c rename to dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_multi_tcp.c diff --git a/media/mtransport/third_party/nICEr/src/net/nr_socket_multi_tcp.h b/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_multi_tcp.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/nr_socket_multi_tcp.h rename to dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_multi_tcp.h diff --git a/media/mtransport/third_party/nICEr/src/net/nr_socket_wrapper.c b/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_wrapper.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/nr_socket_wrapper.c rename to dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_wrapper.c diff --git a/media/mtransport/third_party/nICEr/src/net/nr_socket_wrapper.h b/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_wrapper.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/nr_socket_wrapper.h rename to dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_wrapper.h diff --git a/media/mtransport/third_party/nICEr/src/net/transport_addr.c b/dom/media/webrtc/transport/third_party/nICEr/src/net/transport_addr.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/transport_addr.c rename to dom/media/webrtc/transport/third_party/nICEr/src/net/transport_addr.c diff --git a/media/mtransport/third_party/nICEr/src/net/transport_addr.h b/dom/media/webrtc/transport/third_party/nICEr/src/net/transport_addr.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/transport_addr.h rename to dom/media/webrtc/transport/third_party/nICEr/src/net/transport_addr.h diff --git a/media/mtransport/third_party/nICEr/src/net/transport_addr_reg.c b/dom/media/webrtc/transport/third_party/nICEr/src/net/transport_addr_reg.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/transport_addr_reg.c rename to dom/media/webrtc/transport/third_party/nICEr/src/net/transport_addr_reg.c diff --git a/media/mtransport/third_party/nICEr/src/net/transport_addr_reg.h b/dom/media/webrtc/transport/third_party/nICEr/src/net/transport_addr_reg.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/net/transport_addr_reg.h rename to dom/media/webrtc/transport/third_party/nICEr/src/net/transport_addr_reg.h diff --git a/media/mtransport/third_party/nICEr/src/stun/addrs-bsd.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-bsd.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/addrs-bsd.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-bsd.c diff --git a/media/mtransport/third_party/nICEr/src/stun/addrs-bsd.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-bsd.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/addrs-bsd.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-bsd.h diff --git a/media/mtransport/third_party/nICEr/src/stun/addrs-netlink.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/addrs-netlink.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c diff --git a/media/mtransport/third_party/nICEr/src/stun/addrs-netlink.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/addrs-netlink.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.h diff --git a/media/mtransport/third_party/nICEr/src/stun/addrs-win32.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-win32.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/addrs-win32.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-win32.c diff --git a/media/mtransport/third_party/nICEr/src/stun/addrs-win32.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-win32.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/addrs-win32.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-win32.h diff --git a/media/mtransport/third_party/nICEr/src/stun/addrs.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/addrs.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs.c diff --git a/media/mtransport/third_party/nICEr/src/stun/addrs.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/addrs.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs.h diff --git a/media/mtransport/third_party/nICEr/src/stun/nr_socket_buffered_stun.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/nr_socket_buffered_stun.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/nr_socket_buffered_stun.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/nr_socket_buffered_stun.c diff --git a/media/mtransport/third_party/nICEr/src/stun/nr_socket_buffered_stun.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/nr_socket_buffered_stun.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/nr_socket_buffered_stun.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/nr_socket_buffered_stun.h diff --git a/media/mtransport/third_party/nICEr/src/stun/nr_socket_turn.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/nr_socket_turn.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/nr_socket_turn.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/nr_socket_turn.c diff --git a/media/mtransport/third_party/nICEr/src/stun/nr_socket_turn.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/nr_socket_turn.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/nr_socket_turn.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/nr_socket_turn.h diff --git a/media/mtransport/third_party/nICEr/src/stun/stun.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun.h diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_build.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_build.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_build.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_build.c diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_build.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_build.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_build.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_build.h diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_client_ctx.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_client_ctx.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_client_ctx.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_client_ctx.c diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_client_ctx.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_client_ctx.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_client_ctx.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_client_ctx.h diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_codec.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_codec.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_codec.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_codec.c diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_codec.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_codec.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_codec.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_codec.h diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_hint.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_hint.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_hint.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_hint.c diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_hint.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_hint.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_hint.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_hint.h diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_msg.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_msg.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_msg.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_msg.c diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_msg.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_msg.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_msg.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_msg.h diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_proc.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_proc.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_proc.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_proc.c diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_proc.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_proc.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_proc.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_proc.h diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_reg.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_reg.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_reg.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_reg.h diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_server_ctx.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_server_ctx.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_server_ctx.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_server_ctx.c diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_server_ctx.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_server_ctx.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_server_ctx.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_server_ctx.h diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_util.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_util.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_util.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_util.c diff --git a/media/mtransport/third_party/nICEr/src/stun/stun_util.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_util.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/stun_util.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/stun_util.h diff --git a/media/mtransport/third_party/nICEr/src/stun/turn_client_ctx.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/turn_client_ctx.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/turn_client_ctx.c rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/turn_client_ctx.c diff --git a/media/mtransport/third_party/nICEr/src/stun/turn_client_ctx.h b/dom/media/webrtc/transport/third_party/nICEr/src/stun/turn_client_ctx.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/stun/turn_client_ctx.h rename to dom/media/webrtc/transport/third_party/nICEr/src/stun/turn_client_ctx.h diff --git a/media/mtransport/third_party/nICEr/src/util/cb_args.c b/dom/media/webrtc/transport/third_party/nICEr/src/util/cb_args.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/util/cb_args.c rename to dom/media/webrtc/transport/third_party/nICEr/src/util/cb_args.c diff --git a/media/mtransport/third_party/nICEr/src/util/cb_args.h b/dom/media/webrtc/transport/third_party/nICEr/src/util/cb_args.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/util/cb_args.h rename to dom/media/webrtc/transport/third_party/nICEr/src/util/cb_args.h diff --git a/media/mtransport/third_party/nICEr/src/util/ice_util.c b/dom/media/webrtc/transport/third_party/nICEr/src/util/ice_util.c similarity index 100% rename from media/mtransport/third_party/nICEr/src/util/ice_util.c rename to dom/media/webrtc/transport/third_party/nICEr/src/util/ice_util.c diff --git a/media/mtransport/third_party/nICEr/src/util/ice_util.h b/dom/media/webrtc/transport/third_party/nICEr/src/util/ice_util.h similarity index 100% rename from media/mtransport/third_party/nICEr/src/util/ice_util.h rename to dom/media/webrtc/transport/third_party/nICEr/src/util/ice_util.h diff --git a/media/mtransport/third_party/nICEr/upstream.diff b/dom/media/webrtc/transport/third_party/nICEr/upstream.diff similarity index 100% rename from media/mtransport/third_party/nICEr/upstream.diff rename to dom/media/webrtc/transport/third_party/nICEr/upstream.diff diff --git a/media/mtransport/third_party/nrappkit/COPYRIGHT b/dom/media/webrtc/transport/third_party/nrappkit/COPYRIGHT similarity index 100% rename from media/mtransport/third_party/nrappkit/COPYRIGHT rename to dom/media/webrtc/transport/third_party/nrappkit/COPYRIGHT diff --git a/media/mtransport/third_party/nrappkit/IMPORT_FILES b/dom/media/webrtc/transport/third_party/nrappkit/IMPORT_FILES similarity index 100% rename from media/mtransport/third_party/nrappkit/IMPORT_FILES rename to dom/media/webrtc/transport/third_party/nrappkit/IMPORT_FILES diff --git a/media/mtransport/third_party/nrappkit/README b/dom/media/webrtc/transport/third_party/nrappkit/README similarity index 100% rename from media/mtransport/third_party/nrappkit/README rename to dom/media/webrtc/transport/third_party/nrappkit/README diff --git a/media/mtransport/third_party/nrappkit/README_MOZILLA b/dom/media/webrtc/transport/third_party/nrappkit/README_MOZILLA similarity index 100% rename from media/mtransport/third_party/nrappkit/README_MOZILLA rename to dom/media/webrtc/transport/third_party/nrappkit/README_MOZILLA diff --git a/media/mtransport/third_party/nrappkit/VERSION b/dom/media/webrtc/transport/third_party/nrappkit/VERSION similarity index 100% rename from media/mtransport/third_party/nrappkit/VERSION rename to dom/media/webrtc/transport/third_party/nrappkit/VERSION diff --git a/media/mtransport/third_party/nrappkit/nrappkit.gyp b/dom/media/webrtc/transport/third_party/nrappkit/nrappkit.gyp similarity index 100% rename from media/mtransport/third_party/nrappkit/nrappkit.gyp rename to dom/media/webrtc/transport/third_party/nrappkit/nrappkit.gyp diff --git a/media/mtransport/third_party/nrappkit/src/event/async_timer.h b/dom/media/webrtc/transport/third_party/nrappkit/src/event/async_timer.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/event/async_timer.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/event/async_timer.h diff --git a/media/mtransport/third_party/nrappkit/src/event/async_wait.h b/dom/media/webrtc/transport/third_party/nrappkit/src/event/async_wait.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/event/async_wait.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/event/async_wait.h diff --git a/media/mtransport/third_party/nrappkit/src/event/async_wait_int.h b/dom/media/webrtc/transport/third_party/nrappkit/src/event/async_wait_int.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/event/async_wait_int.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/event/async_wait_int.h diff --git a/media/mtransport/third_party/nrappkit/src/log/r_log.c b/dom/media/webrtc/transport/third_party/nrappkit/src/log/r_log.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/log/r_log.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/log/r_log.c diff --git a/media/mtransport/third_party/nrappkit/src/log/r_log.h b/dom/media/webrtc/transport/third_party/nrappkit/src/log/r_log.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/log/r_log.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/log/r_log.h diff --git a/media/mtransport/third_party/nrappkit/src/plugin/nr_plugin.h b/dom/media/webrtc/transport/third_party/nrappkit/src/plugin/nr_plugin.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/plugin/nr_plugin.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/plugin/nr_plugin.h diff --git a/media/mtransport/third_party/nrappkit/src/port/android/include/android_funcs.h b/dom/media/webrtc/transport/third_party/nrappkit/src/port/android/include/android_funcs.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/port/android/include/android_funcs.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/port/android/include/android_funcs.h diff --git a/media/mtransport/third_party/nrappkit/src/port/android/include/csi_platform.h b/dom/media/webrtc/transport/third_party/nrappkit/src/port/android/include/csi_platform.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/port/android/include/csi_platform.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/port/android/include/csi_platform.h diff --git a/media/mtransport/third_party/nrappkit/src/port/android/include/sys/ttycom.h b/dom/media/webrtc/transport/third_party/nrappkit/src/port/android/include/sys/ttycom.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/port/android/include/sys/ttycom.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/port/android/include/sys/ttycom.h diff --git a/media/mtransport/third_party/nrappkit/src/port/android/port-impl.mk b/dom/media/webrtc/transport/third_party/nrappkit/src/port/android/port-impl.mk similarity index 100% rename from media/mtransport/third_party/nrappkit/src/port/android/port-impl.mk rename to dom/media/webrtc/transport/third_party/nrappkit/src/port/android/port-impl.mk diff --git a/media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h b/dom/media/webrtc/transport/third_party/nrappkit/src/port/darwin/include/csi_platform.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/port/darwin/include/csi_platform.h diff --git a/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h b/dom/media/webrtc/transport/third_party/nrappkit/src/port/generic/include/sys/queue.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/port/generic/include/sys/queue.h diff --git a/media/mtransport/third_party/nrappkit/src/port/linux/include/csi_platform.h b/dom/media/webrtc/transport/third_party/nrappkit/src/port/linux/include/csi_platform.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/port/linux/include/csi_platform.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/port/linux/include/csi_platform.h diff --git a/media/mtransport/third_party/nrappkit/src/port/linux/include/linux_funcs.h b/dom/media/webrtc/transport/third_party/nrappkit/src/port/linux/include/linux_funcs.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/port/linux/include/linux_funcs.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/port/linux/include/linux_funcs.h diff --git a/media/mtransport/third_party/nrappkit/src/port/linux/include/sys/ttycom.h b/dom/media/webrtc/transport/third_party/nrappkit/src/port/linux/include/sys/ttycom.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/port/linux/include/sys/ttycom.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/port/linux/include/sys/ttycom.h diff --git a/media/mtransport/third_party/nrappkit/src/port/linux/port-impl.mk b/dom/media/webrtc/transport/third_party/nrappkit/src/port/linux/port-impl.mk similarity index 100% rename from media/mtransport/third_party/nrappkit/src/port/linux/port-impl.mk rename to dom/media/webrtc/transport/third_party/nrappkit/src/port/linux/port-impl.mk diff --git a/media/mtransport/third_party/nrappkit/src/port/win32/include/csi_platform.h b/dom/media/webrtc/transport/third_party/nrappkit/src/port/win32/include/csi_platform.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/port/win32/include/csi_platform.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/port/win32/include/csi_platform.h diff --git a/media/mtransport/third_party/nrappkit/src/registry/c2ru.c b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/c2ru.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/registry/c2ru.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/registry/c2ru.c diff --git a/media/mtransport/third_party/nrappkit/src/registry/c2ru.h b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/c2ru.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/registry/c2ru.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/registry/c2ru.h diff --git a/media/mtransport/third_party/nrappkit/src/registry/registry.c b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/registry/registry.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c diff --git a/media/mtransport/third_party/nrappkit/src/registry/registry.h b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/registry/registry.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.h diff --git a/media/mtransport/third_party/nrappkit/src/registry/registry_int.h b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry_int.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/registry/registry_int.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry_int.h diff --git a/media/mtransport/third_party/nrappkit/src/registry/registry_local.c b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry_local.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/registry/registry_local.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry_local.c diff --git a/media/mtransport/third_party/nrappkit/src/registry/registry_vtbl.h b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry_vtbl.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/registry/registry_vtbl.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry_vtbl.h diff --git a/media/mtransport/third_party/nrappkit/src/registry/registrycb.c b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registrycb.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/registry/registrycb.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/registry/registrycb.c diff --git a/media/mtransport/third_party/nrappkit/src/share/nr_api.h b/dom/media/webrtc/transport/third_party/nrappkit/src/share/nr_api.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/share/nr_api.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/share/nr_api.h diff --git a/media/mtransport/third_party/nrappkit/src/share/nr_common.h b/dom/media/webrtc/transport/third_party/nrappkit/src/share/nr_common.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/share/nr_common.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/share/nr_common.h diff --git a/media/mtransport/third_party/nrappkit/src/share/nr_reg_keys.h b/dom/media/webrtc/transport/third_party/nrappkit/src/share/nr_reg_keys.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/share/nr_reg_keys.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/share/nr_reg_keys.h diff --git a/media/mtransport/third_party/nrappkit/src/stats/nrstats.h b/dom/media/webrtc/transport/third_party/nrappkit/src/stats/nrstats.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/stats/nrstats.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/stats/nrstats.h diff --git a/media/mtransport/third_party/nrappkit/src/util/byteorder.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/byteorder.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/byteorder.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/byteorder.c diff --git a/media/mtransport/third_party/nrappkit/src/util/byteorder.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/byteorder.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/byteorder.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/byteorder.h diff --git a/media/mtransport/third_party/nrappkit/src/util/hex.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/hex.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/hex.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/hex.c diff --git a/media/mtransport/third_party/nrappkit/src/util/hex.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/hex.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/hex.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/hex.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/assoc.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/assoc.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/assoc.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/assoc.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/debug.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/debug.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/debug.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/debug.c diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/debug.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/debug.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/debug.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/debug.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_assoc.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_assoc.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_assoc.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_assoc.c diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_assoc.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_assoc.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_assoc.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_assoc.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_common.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_common.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_common.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_common.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_crc32.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_crc32.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_crc32.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_crc32.c diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_crc32.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_crc32.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_crc32.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_crc32.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_data.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_data.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_data.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_data.c diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_data.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_data.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_data.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_data.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_defaults.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_defaults.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_defaults.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_defaults.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_errors.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_errors.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_errors.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_errors.c diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_errors.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_errors.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_errors.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_errors.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_includes.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_includes.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_includes.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_includes.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_list.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_list.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_list.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_list.c diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_list.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_list.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_list.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_list.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_macros.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_macros.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_macros.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_macros.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_memory.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_memory.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_memory.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_memory.c diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_memory.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_memory.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_memory.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_memory.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_replace.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_replace.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_replace.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_replace.c diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_thread.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_thread.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_thread.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_thread.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_time.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_time.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_time.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_time.c diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_time.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_time.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_time.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_time.h diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_types.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_types.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/libekr/r_types.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_types.h diff --git a/media/mtransport/third_party/nrappkit/src/util/p_buf.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/p_buf.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/p_buf.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/p_buf.c diff --git a/media/mtransport/third_party/nrappkit/src/util/p_buf.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/p_buf.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/p_buf.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/p_buf.h diff --git a/media/mtransport/third_party/nrappkit/src/util/util.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/util.c similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/util.c rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/util.c diff --git a/media/mtransport/third_party/nrappkit/src/util/util.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/util.h similarity index 100% rename from media/mtransport/third_party/nrappkit/src/util/util.h rename to dom/media/webrtc/transport/third_party/nrappkit/src/util/util.h diff --git a/media/mtransport/third_party/nrappkit/upstream.diff b/dom/media/webrtc/transport/third_party/nrappkit/upstream.diff similarity index 69% rename from media/mtransport/third_party/nrappkit/upstream.diff rename to dom/media/webrtc/transport/third_party/nrappkit/upstream.diff index df296677f19d..50b88961dcf7 100644 --- a/media/mtransport/third_party/nrappkit/upstream.diff +++ b/dom/media/webrtc/transport/third_party/nrappkit/upstream.diff @@ -1,6 +1,6 @@ -diff --git a/media/mtransport/third_party/nrappkit/src/event/async_wait.h b/media/mtransport/third_party/nrappkit/src/event/async_wait.h ---- a/media/mtransport/third_party/nrappkit/src/event/async_wait.h -+++ b/media/mtransport/third_party/nrappkit/src/event/async_wait.h +diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/event/async_wait.h b/dom/media/webrtc/transport/third_party/nrappkit/src/event/async_wait.h +--- a/dom/media/webrtc/transport/third_party/nrappkit/src/event/async_wait.h ++++ b/dom/media/webrtc/transport/third_party/nrappkit/src/event/async_wait.h @@ -38,21 +38,21 @@ @@ -24,9 +24,9 @@ diff --git a/media/mtransport/third_party/nrappkit/src/event/async_wait.h b/medi char *function,int line); int NR_async_cancel(NR_SOCKET sock,int how); int NR_async_schedule(NR_async_cb cb,void *arg,char *function,int line); -diff --git a/media/mtransport/third_party/nrappkit/src/log/r_log.c b/media/mtransport/third_party/nrappkit/src/log/r_log.c ---- a/media/mtransport/third_party/nrappkit/src/log/r_log.c -+++ b/media/mtransport/third_party/nrappkit/src/log/r_log.c +diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/log/r_log.c b/dom/media/webrtc/transport/third_party/nrappkit/src/log/r_log.c +--- a/dom/media/webrtc/transport/third_party/nrappkit/src/log/r_log.c ++++ b/dom/media/webrtc/transport/third_party/nrappkit/src/log/r_log.c @@ -33,28 +33,41 @@ POSSIBILITY OF SUCH DAMAGE. @@ -69,9 +69,9 @@ diff --git a/media/mtransport/third_party/nrappkit/src/log/r_log.c b/media/mtran "CRIT", "ERR", "WARNING", -diff --git a/media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h b/media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h ---- a/media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h -+++ b/media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h +diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/port/darwin/include/csi_platform.h b/dom/media/webrtc/transport/third_party/nrappkit/src/port/darwin/include/csi_platform.h +--- a/dom/media/webrtc/transport/third_party/nrappkit/src/port/darwin/include/csi_platform.h ++++ b/dom/media/webrtc/transport/third_party/nrappkit/src/port/darwin/include/csi_platform.h @@ -37,17 +37,21 @@ */ @@ -94,9 +94,9 @@ diff --git a/media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_p #endif -diff --git a/media/mtransport/third_party/nrappkit/src/port/linux/include/csi_platform.h b/media/mtransport/third_party/nrappkit/src/port/linux/include/csi_platform.h ---- a/media/mtransport/third_party/nrappkit/src/port/linux/include/csi_platform.h -+++ b/media/mtransport/third_party/nrappkit/src/port/linux/include/csi_platform.h +diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/port/linux/include/csi_platform.h b/dom/media/webrtc/transport/third_party/nrappkit/src/port/linux/include/csi_platform.h +--- a/dom/media/webrtc/transport/third_party/nrappkit/src/port/linux/include/csi_platform.h ++++ b/dom/media/webrtc/transport/third_party/nrappkit/src/port/linux/include/csi_platform.h @@ -35,17 +35,21 @@ ekr@rtfm.com Mon Dec 13 17:26:51 2004 @@ -119,9 +119,9 @@ diff --git a/media/mtransport/third_party/nrappkit/src/port/linux/include/csi_pl #endif -diff --git a/media/mtransport/third_party/nrappkit/src/port/win32/include/csi_platform.h b/media/mtransport/third_party/nrappkit/src/port/win32/include/csi_platform.h ---- a/media/mtransport/third_party/nrappkit/src/port/win32/include/csi_platform.h -+++ b/media/mtransport/third_party/nrappkit/src/port/win32/include/csi_platform.h +diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/port/win32/include/csi_platform.h b/dom/media/webrtc/transport/third_party/nrappkit/src/port/win32/include/csi_platform.h +--- a/dom/media/webrtc/transport/third_party/nrappkit/src/port/win32/include/csi_platform.h ++++ b/dom/media/webrtc/transport/third_party/nrappkit/src/port/win32/include/csi_platform.h @@ -44,45 +44,51 @@ #define _WIN32_WINNT 0x0400 // This prevents weird "'TryEnterCriticalSection': identifier not found" // compiler errors when poco/win32_mutex.h is included @@ -175,9 +175,9 @@ diff --git a/media/mtransport/third_party/nrappkit/src/port/win32/include/csi_pl #define LOG_INFO 6 #define LOG_DEBUG 7 -diff --git a/media/mtransport/third_party/nrappkit/src/registry/registry.c b/media/mtransport/third_party/nrappkit/src/registry/registry.c ---- a/media/mtransport/third_party/nrappkit/src/registry/registry.c -+++ b/media/mtransport/third_party/nrappkit/src/registry/registry.c +diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c +--- a/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c ++++ b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c @@ -37,21 +37,22 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) @@ -202,9 +202,9 @@ diff --git a/media/mtransport/third_party/nrappkit/src/registry/registry.c b/med #include "registry.h" #include "registry_int.h" #include "registry_vtbl.h" -diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_crc32.c b/media/mtransport/third_party/nrappkit/src/util/libekr/r_crc32.c ---- a/media/mtransport/third_party/nrappkit/src/util/libekr/r_crc32.c -+++ b/media/mtransport/third_party/nrappkit/src/util/libekr/r_crc32.c +diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_crc32.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_crc32.c +--- a/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_crc32.c ++++ b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_crc32.c @@ -58,20 +58,21 @@ * the crc computation is finished. The crc should be complemented * before transmission. @@ -227,9 +227,9 @@ diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_crc32.c b/m #define CRC(crc, ch) (crc = (crc >> 8) ^ crctab[(crc ^ (ch)) & 0xff]) /* generated using the AUTODIN II polynomial -diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_macros.h b/media/mtransport/third_party/nrappkit/src/util/libekr/r_macros.h ---- a/media/mtransport/third_party/nrappkit/src/util/libekr/r_macros.h -+++ b/media/mtransport/third_party/nrappkit/src/util/libekr/r_macros.h +diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_macros.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_macros.h +--- a/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_macros.h ++++ b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_macros.h @@ -118,20 +118,20 @@ #ifndef MIN #define MIN(a,b) ((a)>(b))?(b):(a) @@ -252,9 +252,9 @@ diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_macros.h b/ #include "r_memory.h" #endif -diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_time.h b/media/mtransport/third_party/nrappkit/src/util/libekr/r_time.h ---- a/media/mtransport/third_party/nrappkit/src/util/libekr/r_time.h -+++ b/media/mtransport/third_party/nrappkit/src/util/libekr/r_time.h +diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_time.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_time.h +--- a/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_time.h ++++ b/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr/r_time.h @@ -77,35 +77,25 @@ $Id: r_time.h,v 1.4 2007/06/26 22:37:57 adamcain Exp $ @@ -295,9 +295,9 @@ diff --git a/media/mtransport/third_party/nrappkit/src/util/libekr/r_time.h b/me int r_int2timeval(UINT8 t,struct timeval *tv); UINT8 r_gettimeint(void); -diff --git a/media/mtransport/third_party/nrappkit/src/util/util.c b/media/mtransport/third_party/nrappkit/src/util/util.c ---- a/media/mtransport/third_party/nrappkit/src/util/util.c -+++ b/media/mtransport/third_party/nrappkit/src/util/util.c +diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/util/util.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/util.c +--- a/dom/media/webrtc/transport/third_party/nrappkit/src/util/util.c ++++ b/dom/media/webrtc/transport/third_party/nrappkit/src/util/util.c @@ -292,20 +292,22 @@ int nr_sha1_file(char *filename,UCHAR *o return(_status); @@ -368,9 +368,9 @@ diff --git a/media/mtransport/third_party/nrappkit/src/util/util.c b/media/mtran + #endif -diff --git a/media/mtransport/third_party/nrappkit/src/util/util.h b/media/mtransport/third_party/nrappkit/src/util/util.h ---- a/media/mtransport/third_party/nrappkit/src/util/util.h -+++ b/media/mtransport/third_party/nrappkit/src/util/util.h +diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/util/util.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/util.h +--- a/dom/media/webrtc/transport/third_party/nrappkit/src/util/util.h ++++ b/dom/media/webrtc/transport/third_party/nrappkit/src/util/util.h @@ -57,12 +57,17 @@ int nr_drop_privileges(char *username); int nr_hex_ascii_dump(Data *data); int nr_fwrite_all(FILE *fp,UCHAR *buf,int len); diff --git a/media/mtransport/transportflow.cpp b/dom/media/webrtc/transport/transportflow.cpp similarity index 100% rename from media/mtransport/transportflow.cpp rename to dom/media/webrtc/transport/transportflow.cpp diff --git a/media/mtransport/transportflow.h b/dom/media/webrtc/transport/transportflow.h similarity index 100% rename from media/mtransport/transportflow.h rename to dom/media/webrtc/transport/transportflow.h diff --git a/media/mtransport/transportlayer.cpp b/dom/media/webrtc/transport/transportlayer.cpp similarity index 100% rename from media/mtransport/transportlayer.cpp rename to dom/media/webrtc/transport/transportlayer.cpp diff --git a/media/mtransport/transportlayer.h b/dom/media/webrtc/transport/transportlayer.h similarity index 100% rename from media/mtransport/transportlayer.h rename to dom/media/webrtc/transport/transportlayer.h diff --git a/media/mtransport/transportlayerdtls.cpp b/dom/media/webrtc/transport/transportlayerdtls.cpp similarity index 100% rename from media/mtransport/transportlayerdtls.cpp rename to dom/media/webrtc/transport/transportlayerdtls.cpp diff --git a/media/mtransport/transportlayerdtls.h b/dom/media/webrtc/transport/transportlayerdtls.h similarity index 100% rename from media/mtransport/transportlayerdtls.h rename to dom/media/webrtc/transport/transportlayerdtls.h diff --git a/media/mtransport/transportlayerice.cpp b/dom/media/webrtc/transport/transportlayerice.cpp similarity index 100% rename from media/mtransport/transportlayerice.cpp rename to dom/media/webrtc/transport/transportlayerice.cpp diff --git a/media/mtransport/transportlayerice.h b/dom/media/webrtc/transport/transportlayerice.h similarity index 100% rename from media/mtransport/transportlayerice.h rename to dom/media/webrtc/transport/transportlayerice.h diff --git a/media/mtransport/transportlayerlog.cpp b/dom/media/webrtc/transport/transportlayerlog.cpp similarity index 100% rename from media/mtransport/transportlayerlog.cpp rename to dom/media/webrtc/transport/transportlayerlog.cpp diff --git a/media/mtransport/transportlayerlog.h b/dom/media/webrtc/transport/transportlayerlog.h similarity index 100% rename from media/mtransport/transportlayerlog.h rename to dom/media/webrtc/transport/transportlayerlog.h diff --git a/media/mtransport/transportlayerloopback.cpp b/dom/media/webrtc/transport/transportlayerloopback.cpp similarity index 100% rename from media/mtransport/transportlayerloopback.cpp rename to dom/media/webrtc/transport/transportlayerloopback.cpp diff --git a/media/mtransport/transportlayerloopback.h b/dom/media/webrtc/transport/transportlayerloopback.h similarity index 100% rename from media/mtransport/transportlayerloopback.h rename to dom/media/webrtc/transport/transportlayerloopback.h diff --git a/media/mtransport/transportlayersrtp.cpp b/dom/media/webrtc/transport/transportlayersrtp.cpp similarity index 100% rename from media/mtransport/transportlayersrtp.cpp rename to dom/media/webrtc/transport/transportlayersrtp.cpp diff --git a/media/mtransport/transportlayersrtp.h b/dom/media/webrtc/transport/transportlayersrtp.h similarity index 100% rename from media/mtransport/transportlayersrtp.h rename to dom/media/webrtc/transport/transportlayersrtp.h diff --git a/dom/network/UDPSocketParent.cpp b/dom/network/UDPSocketParent.cpp index e211b34a8ff7..acaaaa346cec 100644 --- a/dom/network/UDPSocketParent.cpp +++ b/dom/network/UDPSocketParent.cpp @@ -16,7 +16,7 @@ #include "mozilla/net/PNeckoParent.h" #include "nsIPermissionManager.h" #include "mozilla/ipc/PBackgroundParent.h" -#include "mtransport/runnable_utils.h" +#include "transport/runnable_utils.h" namespace mozilla { @@ -38,7 +38,7 @@ bool UDPSocketParent::Init(nsIPrincipal* aPrincipal, const nsACString& aFilter) { MOZ_ASSERT_IF(mBackgroundManager, !aPrincipal); // will be used once we move all UDPSocket to PBackground, or - // if we add in Principal checking for mtransport + // if we add in Principal checking for dom/media/webrtc/transport Unused << mBackgroundManager; mPrincipal = aPrincipal; diff --git a/dom/plugins/ipc/FunctionBroker.h b/dom/plugins/ipc/FunctionBroker.h index 3b86fe98678c..25760439744b 100644 --- a/dom/plugins/ipc/FunctionBroker.h +++ b/dom/plugins/ipc/FunctionBroker.h @@ -13,7 +13,7 @@ #include "base/task.h" #include "mozilla/ipc/ProcessChild.h" #include "FunctionBrokerChild.h" -#include "mtransport/runnable_utils.h" +#include "transport/runnable_utils.h" #include "PluginMessageUtils.h" #include "mozilla/Logging.h" #include "FunctionHook.h" diff --git a/gfx/layers/ipc/ImageBridgeChild.cpp b/gfx/layers/ipc/ImageBridgeChild.cpp index ded9580b937e..8278a8fe5039 100644 --- a/gfx/layers/ipc/ImageBridgeChild.cpp +++ b/gfx/layers/ipc/ImageBridgeChild.cpp @@ -33,7 +33,7 @@ #include "mozilla/media/MediaSystemResourceManager.h" // for MediaSystemResourceManager #include "mozilla/media/MediaSystemResourceManagerChild.h" // for MediaSystemResourceManagerChild #include "mozilla/mozalloc.h" // for operator new, etc -#include "mtransport/runnable_utils.h" +#include "transport/runnable_utils.h" #include "nsContentUtils.h" #include "nsISupportsImpl.h" // for ImageContainer::AddRef, etc #include "nsTArray.h" // for AutoTArray, nsTArray, etc diff --git a/gfx/layers/ipc/VideoBridgeChild.cpp b/gfx/layers/ipc/VideoBridgeChild.cpp index b4f145ec49a7..6ee0ebbc0c77 100644 --- a/gfx/layers/ipc/VideoBridgeChild.cpp +++ b/gfx/layers/ipc/VideoBridgeChild.cpp @@ -8,7 +8,7 @@ #include "VideoBridgeParent.h" #include "CompositorThread.h" #include "mozilla/dom/ContentChild.h" -#include "mtransport/runnable_utils.h" +#include "transport/runnable_utils.h" #include "SynchronousTask.h" namespace mozilla { diff --git a/gfx/webrender_bindings/RenderThread.cpp b/gfx/webrender_bindings/RenderThread.cpp index 2110009eb61a..67b4ce538729 100644 --- a/gfx/webrender_bindings/RenderThread.cpp +++ b/gfx/webrender_bindings/RenderThread.cpp @@ -9,7 +9,7 @@ #include "GLContext.h" #include "RenderThread.h" #include "nsThreadUtils.h" -#include "mtransport/runnable_utils.h" +#include "transport/runnable_utils.h" #include "mozilla/layers/AsyncImagePipelineManager.h" #include "mozilla/gfx/gfxVars.h" #include "mozilla/gfx/GPUParent.h" diff --git a/media/mtransport/fuzztest/moz.build b/media/mtransport/fuzztest/moz.build deleted file mode 100644 index 5d2e43b57055..000000000000 --- a/media/mtransport/fuzztest/moz.build +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -Library('FuzzingStun') - -DEFINES['HAVE_STRDUP'] = True - -LOCAL_INCLUDES += [ - '/ipc/chromium/src', - '/media/mtransport', - '/media/mtransport/third_party/nICEr/src/net', - '/media/mtransport/third_party/nICEr/src/stun', - '/media/mtransport/third_party/nrappkit/src/event', - '/media/mtransport/third_party/nrappkit/src/log', - '/media/mtransport/third_party/nrappkit/src/plugin', - '/media/mtransport/third_party/nrappkit/src/port/darwin/include', - '/media/mtransport/third_party/nrappkit/src/share', - '/media/mtransport/third_party/nrappkit/src/stats', - '/media/mtransport/third_party/nrappkit/src/util/libekr', -] - -# Add libFuzzer configuration directives -include('/tools/fuzzing/libfuzzer-config.mozbuild') - -SOURCES += [ - 'stun_parser_libfuzz.cpp', -] - -FINAL_LIBRARY = 'xul-gtest' diff --git a/media/webrtc/signaling/gtest/moz.build b/media/webrtc/signaling/gtest/moz.build index 162091c6d63e..9e91f4fb5219 100644 --- a/media/webrtc/signaling/gtest/moz.build +++ b/media/webrtc/signaling/gtest/moz.build @@ -18,10 +18,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'uikit' and CONFIG['OS_TARGET'] != 'Android' and not (CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['MOZ_ASAN']): LOCAL_INCLUDES += [ '/dom/media', + '/dom/media/webrtc/transport', + '/dom/media/webrtc/transport/test', + '/dom/media/webrtc/transport/third_party/nrappkit/src/registry', '/ipc/chromium/src', - '/media/mtransport', - '/media/mtransport/test', - '/media/mtransport/third_party/nrappkit/src/registry', '/media/webrtc/', '/media/webrtc/signaling/src/common', '/media/webrtc/signaling/src/common/time_profiling', diff --git a/media/webrtc/signaling/src/common/moz.build b/media/webrtc/signaling/src/common/moz.build index 4a77c364cc4e..9982fe217934 100644 --- a/media/webrtc/signaling/src/common/moz.build +++ b/media/webrtc/signaling/src/common/moz.build @@ -10,7 +10,7 @@ EXPORTS.mozilla.dom += [ ] LOCAL_INCLUDES += [ - '/media/mtransport/third_party/nrappkit/src/util/libekr', + '/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr', '/media/webrtc/trunk', '/media/webrtc/trunk/webrtc', ] diff --git a/media/webrtc/signaling/src/jsep/moz.build b/media/webrtc/signaling/src/jsep/moz.build index 582c8a923a31..932564849b72 100644 --- a/media/webrtc/signaling/src/jsep/moz.build +++ b/media/webrtc/signaling/src/jsep/moz.build @@ -6,7 +6,7 @@ include('/media/webrtc/webrtc.mozbuild') LOCAL_INCLUDES += [ - '/media/mtransport', + '/dom/media/webrtc/transport', '/media/webrtc', '/media/webrtc/trunk', '/media/webrtc/trunk/webrtc', diff --git a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp index 55123103d324..f427be7fa34f 100644 --- a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp +++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp @@ -17,7 +17,7 @@ #include "nsServiceManagerUtils.h" #include "nsThreadUtils.h" #include "mozilla/Telemetry.h" -#include "mtransport/runnable_utils.h" +#include "transport/runnable_utils.h" #include "pk11pub.h" diff --git a/media/webrtc/signaling/src/media-conduit/moz.build b/media/webrtc/signaling/src/media-conduit/moz.build index 25ea72a426f9..c4add889e974 100644 --- a/media/webrtc/signaling/src/media-conduit/moz.build +++ b/media/webrtc/signaling/src/media-conduit/moz.build @@ -8,9 +8,9 @@ include('../../../webrtc.mozbuild') LOCAL_INCLUDES += [ '!/ipc/ipdl/_ipdlheaders', '/dom/media/gmp', # for GMPLog.h + '/dom/media/webrtc/transport', '/ipc/chromium/src', '/media/libyuv/libyuv/include', - '/media/mtransport', '/media/webrtc', '/media/webrtc/signaling/src/common', '/media/webrtc/signaling/src/common/browser_logging', diff --git a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h index 484a4431cec7..b2cbf315d367 100644 --- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h +++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h @@ -18,7 +18,7 @@ #include "mozilla/Atomics.h" #include "SrtpFlow.h" // For SRTP_MAX_EXPANSION #include "mediapacket.h" -#include "mtransport/runnable_utils.h" +#include "transport/runnable_utils.h" #include "AudioPacketizer.h" #include "MediaPipelineFilter.h" #include "MediaSegment.h" diff --git a/media/webrtc/signaling/src/mediapipeline/RtpLogger.h b/media/webrtc/signaling/src/mediapipeline/RtpLogger.h index 68472745bd11..7a8289d16ae5 100644 --- a/media/webrtc/signaling/src/mediapipeline/RtpLogger.h +++ b/media/webrtc/signaling/src/mediapipeline/RtpLogger.h @@ -8,7 +8,7 @@ #define rtplogger_h__ #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" -#include "mtransport/mediapacket.h" +#include "transport/mediapacket.h" namespace mozilla { diff --git a/media/webrtc/signaling/src/mediapipeline/moz.build b/media/webrtc/signaling/src/mediapipeline/moz.build index 2662d5acc07a..1e096d521d23 100644 --- a/media/webrtc/signaling/src/mediapipeline/moz.build +++ b/media/webrtc/signaling/src/mediapipeline/moz.build @@ -8,9 +8,9 @@ include('/media/webrtc/webrtc.mozbuild') LOCAL_INCLUDES += [ '!/ipc/ipdl/_ipdlheaders', '/dom/media', + '/dom/media/webrtc/transport', '/ipc/chromium/src', '/media/libyuv/libyuv/include', - '/media/mtransport', '/media/webrtc', '/media/webrtc/signaling/src/media-conduit', '/media/webrtc/signaling/src/peerconnection', diff --git a/media/webrtc/signaling/src/peerconnection/moz.build b/media/webrtc/signaling/src/peerconnection/moz.build index f155d8c49814..af68e8451bc8 100644 --- a/media/webrtc/signaling/src/peerconnection/moz.build +++ b/media/webrtc/signaling/src/peerconnection/moz.build @@ -9,8 +9,8 @@ LOCAL_INCLUDES += [ '!/ipc/ipdl/_ipdlheaders', '/dom/base', '/dom/media', + '/dom/media/webrtc/transport', '/ipc/chromium/src', - '/media/mtransport', '/media/webrtc', '/media/webrtc/signaling/src/common', '/media/webrtc/signaling/src/common/browser_logging', diff --git a/media/webrtc/signaling/src/sdp/moz.build b/media/webrtc/signaling/src/sdp/moz.build index ad937adb0833..b7fd018f8dd8 100644 --- a/media/webrtc/signaling/src/sdp/moz.build +++ b/media/webrtc/signaling/src/sdp/moz.build @@ -15,7 +15,7 @@ else: include('/tools/fuzzing/libfuzzer-config.mozbuild') LOCAL_INCLUDES += [ - '/media/mtransport', + '/dom/media/webrtc/transport', '/media/webrtc', '/media/webrtc/signaling/src/common/browser_logging', '/media/webrtc/trunk', diff --git a/netwerk/base/nsUDPSocket.cpp b/netwerk/base/nsUDPSocket.cpp index 12d1cf4874e0..e9e3541d00de 100644 --- a/netwerk/base/nsUDPSocket.cpp +++ b/netwerk/base/nsUDPSocket.cpp @@ -1061,7 +1061,7 @@ nsUDPSocket::AsyncListen(nsIUDPSocketListener* aListener) { // PNecko usage mListener = new SocketListenerProxy(aListener); } else { - // PBackground usage from media/mtransport + // PBackground usage from dom/media/webrtc/transport mListener = new SocketListenerProxyBackground(aListener); } } diff --git a/netwerk/ipc/moz.build b/netwerk/ipc/moz.build index d881f6c78b0c..f87abc7f103f 100644 --- a/netwerk/ipc/moz.build +++ b/netwerk/ipc/moz.build @@ -70,13 +70,13 @@ IPDL_SOURCES = [ # needed so --disable-webrtc builds work (yes, a bit messy) if not CONFIG['MOZ_WEBRTC']: IPDL_SOURCES += [ - '../../media/mtransport/ipc/PStunAddrsRequest.ipdl', - '../../media/mtransport/ipc/PWebrtcTCPSocket.ipdl', - '../../media/mtransport/ipc/WebrtcProxyConfig.ipdlh', + '../../dom/media/webrtc/transport/ipc/PStunAddrsRequest.ipdl', + '../../dom/media/webrtc/transport/ipc/PWebrtcTCPSocket.ipdl', + '../../dom/media/webrtc/transport/ipc/WebrtcProxyConfig.ipdlh', ] EXPORTS.mozilla.net += [ - '../../media/mtransport/ipc/NrIceStunAddrMessageUtils.h', - '../../media/mtransport/ipc/PStunAddrsParams.h', + '../../dom/media/webrtc/transport/ipc/NrIceStunAddrMessageUtils.h', + '../../dom/media/webrtc/transport/ipc/PStunAddrsParams.h', ] include('/ipc/chromium/chromium-config.mozbuild') @@ -86,7 +86,7 @@ FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '/caps', '/dom/base', - '/media/mtransport', + '/dom/media/webrtc/transport', '/media/webrtc', '/modules/libjar', '/netwerk/base', diff --git a/netwerk/sctp/datachannel/DataChannel.cpp b/netwerk/sctp/datachannel/DataChannel.cpp index 06388d51493a..3d6655c27b35 100644 --- a/netwerk/sctp/datachannel/DataChannel.cpp +++ b/netwerk/sctp/datachannel/DataChannel.cpp @@ -49,7 +49,7 @@ #include "mozilla/dom/RTCDataChannelBinding.h" #include "mozilla/dom/RTCStatsReportBinding.h" #ifdef MOZ_PEERCONNECTION -# include "mtransport/runnable_utils.h" +# include "transport/runnable_utils.h" # include "signaling/src/peerconnection/MediaTransportHandler.h" # include "mediapacket.h" #endif @@ -226,7 +226,7 @@ class DataChannelRegistry : public nsIObserver { #ifdef MOZ_PEERCONNECTION usrsctp_init(0, DataChannelRegistry::SctpDtlsOutput, debug_printf); #else - MOZ_CRASH("Trying to use SCTP/DTLS without mtransport"); + MOZ_CRASH("Trying to use SCTP/DTLS without dom/media/webrtc/transport"); #endif // Set logging to SCTP:LogLevel::Debug to get SCTP debugs diff --git a/netwerk/sctp/datachannel/DataChannel.h b/netwerk/sctp/datachannel/DataChannel.h index 3e27e0faea02..24e6f785cffe 100644 --- a/netwerk/sctp/datachannel/DataChannel.h +++ b/netwerk/sctp/datachannel/DataChannel.h @@ -31,8 +31,8 @@ #include "DataChannelLog.h" #ifdef SCTP_DTLS_SUPPORTED -# include "mtransport/sigslot.h" -# include "mtransport/transportlayer.h" // For TransportLayer::State +# include "transport/sigslot.h" +# include "transport/transportlayer.h" // For TransportLayer::State #endif #ifndef EALREADY diff --git a/netwerk/sctp/datachannel/moz.build b/netwerk/sctp/datachannel/moz.build index 014287a1ceb7..ce7b2b6c1452 100644 --- a/netwerk/sctp/datachannel/moz.build +++ b/netwerk/sctp/datachannel/moz.build @@ -20,7 +20,7 @@ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '/media/mtransport', + '/dom/media/webrtc/transport', '/media/webrtc', '/netwerk/sctp/src', ] diff --git a/testing/runcppunittests.py b/testing/runcppunittests.py index f96085c4964f..c921a20c4a53 100755 --- a/testing/runcppunittests.py +++ b/testing/runcppunittests.py @@ -151,7 +151,7 @@ class CPPUnitTests(object): else: self.log.info("Failed to find ASan symbolizer at %s" % llvmsym) - # media/mtransport tests statically link in NSS, which + # dom/media/webrtc/transport tests statically link in NSS, which # causes ODR violations. See bug 1215679. assert 'ASAN_OPTIONS' not in env env['ASAN_OPTIONS'] = 'detect_leaks=0:detect_odr_violation=0' diff --git a/toolkit/content/license.html b/toolkit/content/license.html index 26a0743af8e2..c20f3f8283c2 100644 --- a/toolkit/content/license.html +++ b/toolkit/content/license.html @@ -4609,8 +4609,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

This license applies to the following files:

@@ -4976,7 +4976,7 @@ THE SOFTWARE.
     
nICEr License

 
     
This license applies to certain files in the directory
-    media/mtransport/third_party/nICEr.

+    dom/media/webrtc/transport/third_party/nICEr.

 
 
    Copyright (C) 2007, Adobe Systems Inc.
@@ -5249,7 +5249,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     
nrappkit License

 
     
This license applies to certain files in the directory
-    media/mtransport/third_party/nrappkit.

+    dom/media/webrtc/transport/third_party/nrappkit.

 
 
 Copyright (C) 2001-2007, Network Resonance, Inc.
@@ -5283,7 +5283,7 @@ POSSIBILITY OF SUCH DAMAGE.
 

 
     
This license applies to certain files in the directory
-    media/mtransport/third_party/nrappkit.

+    dom/media/webrtc/transport/third_party/nrappkit.

 
 
 Copyright (C) 1999-2003 RTFM, Inc.
@@ -5328,7 +5328,7 @@ SUCH DAMAGE.
    files included in this distribution. it does not apply to any other
    part of ssldump not included in this distribution.

 
-    
This license applies to the file media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h.

+    
This license applies to the file dom/media/webrtc/transport/third_party/nrappkit/src/port/generic/include/sys/queue.h.

 
 
 Copyright (c) 1991, 1993
@@ -5361,7 +5361,7 @@ SUCH DAMAGE.
 
 
   
This license applies to the file:
-  media/mtransport/third_party/nrappkit/src/util/util.c.

+  dom/media/webrtc/transport/third_party/nrappkit/src/util/util.c.

 
 
 Copyright (c) 1998 Todd C. Miller 
@@ -5453,7 +5453,7 @@ SOFTWARE.
 
     
This license applies to the files
     nsprpub/pr/src/misc/praton.c and
-    media/mtransport/third_party/nrappkit/src/util/util.c.

+    dom/media/webrtc/transport/third_party/nrappkit/src/util/util.c.

 
 
 Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -6970,7 +6970,7 @@ Database section 7.
       
  • db/mork/src/morkQuickSort.cpp
    • 
       
  • xpcom/ds/nsQuickSort.cpp
    • 
       
  • nsprpub/pr/src/misc/praton.c
    • 
-      
  • media/mtransport/third_party/nICEr/src/stun/addrs.c
    • 
+      
  • dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs.c
    • 
     
 
 
    diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
index 4aa9a91db1c8..b10aff5bc8d0 100644
--- a/toolkit/library/rust/shared/Cargo.toml
+++ b/toolkit/library/rust/shared/Cargo.toml
@@ -42,7 +42,7 @@ bookmark_sync = { path = "../../../components/places/bookmark_sync", optional =
 shift_or_euc_c = "0.1.0"
 chardetng_c = "0.1.1"
 audio_thread_priority = "0.23.4"
-mdns_service = { path="../../../../media/mtransport/mdns_service", optional = true }
+mdns_service = { path="../../../../dom/media/webrtc/transport/mdns_service", optional = true }
 neqo_glue = { path = "../../../../netwerk/socket/neqo_glue" }
 rlbox_lucet_sandbox = { version = "0.1.0", optional = true }
 wgpu_bindings = { path = "../../../../gfx/wgpu_bindings", optional = true }
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index 93df016f7d05..bbc3c98e4885 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -92,7 +92,7 @@ DIRS += [
 if CONFIG['MOZ_WEBRTC'] and CONFIG['COMPILE_ENVIRONMENT']:
     DIRS += [
         '/media/webrtc',
-        '/media/mtransport',
+        '/dom/media/webrtc/transport',
     ]
 
 if CONFIG['ENABLE_TESTS']:
@@ -196,7 +196,7 @@ if CONFIG['ENABLE_TESTS']:
 
     if CONFIG['MOZ_WEBRTC'] and not CONFIG['MOZ_TASK_TRACER']:
         DIRS += [
-            '/media/mtransport/test',
+            '/dom/media/webrtc/transport/test',
         ]
 
 if CONFIG['FUZZING']:
diff --git a/tools/fuzzing/docs/fuzzing_interface.rst b/tools/fuzzing/docs/fuzzing_interface.rst
index 55ab400e50e1..2b45abf35b69 100644
--- a/tools/fuzzing/docs/fuzzing_interface.rst
+++ b/tools/fuzzing/docs/fuzzing_interface.rst
@@ -174,13 +174,13 @@ The code using the fuzzing interface usually lives in a separate directory
 called ``fuzztest`` that is on the same level as gtests. If your component
 has no gtests, then a subdirectory either in tests or in your main directory
 will work. If such a directory does not exist yet in your component, then you
-need to create one with a suitable ``moz.build``. See  `the mtransport target
-for an example `__
+need to create one with a suitable ``moz.build``. See  `the transport target
+for an example `__
 
 In order to include the new subdirectory into the build process, you will
 also have to modify the toplevel ``moz.build`` file accordingly. For this
 purpose, you should add your directory to ``TEST_DIRS`` only if ``FUZZING_INTERFACES``
-is set. See again `the mtransport target for an example
+is set. See again `the transport target for an example
 `__.
 
 How your code should look like
@@ -274,7 +274,7 @@ but the macro invocation is quite similar:
   MOZ_FUZZING_INTERFACE_STREAM(FuzzingInitMyTarget, FuzzingRunMyTarget, MyTarget);
 
 For a live example, see also the `implementation of the STUN fuzzing target
-`__.
+`__.
 
 Add instrumentation to the code being tested
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/tools/lint/clippy.yml b/tools/lint/clippy.yml
index 735c9bcfcf64..fcdee168fad6 100644
--- a/tools/lint/clippy.yml
+++ b/tools/lint/clippy.yml
@@ -89,7 +89,7 @@ clippy:
         - xpcom/rust/moz_task/
         - xpcom/rust/gkrust_utils/
         - netwerk/socket/neqo_glue/
-        - media/mtransport/mdns_service/
+        - dom/media/webrtc/transport/mdns_service/
         - media/audioipc/client/
         - media/audioipc/audioipc/
         - media/audioipc/server/
diff --git a/tools/lint/file-whitespace.yml b/tools/lint/file-whitespace.yml
index adbe4d3d6997..2d3ff33e4b3e 100644
--- a/tools/lint/file-whitespace.yml
+++ b/tools/lint/file-whitespace.yml
@@ -46,6 +46,7 @@ file-whitespace:
         - dom/media/test
         - dom/media/tests
         - dom/media/webaudio/test
+        - dom/media/webrtc/transport/nricectx.cpp
         - dom/media/webspeech/synth/test
         - dom/plugins/test
         - dom/smil/crashtests
@@ -105,7 +106,6 @@ file-whitespace:
         - layout/xul/reftest
         - layout/xul/test
         - layout/xul/tree
-        - media/mtransport/nricectx.cpp
         - modules/libjar/zipwriter/test/unit/data/test_bug399727.html
         - netwerk/test/crashtests
         - netwerk/dns/prepare_tlds.py
diff --git a/tools/lint/rejected-words.yml b/tools/lint/rejected-words.yml
index 5bd5aaa16c8d..a9a2ef36cc8d 100644
--- a/tools/lint/rejected-words.yml
+++ b/tools/lint/rejected-words.yml
@@ -123,6 +123,8 @@ avoid-blacklist-and-whitelist:
         - dom/media/test/test_autoplay_policy_key_blacklist.html
         - dom/media/test/test_autoplay_policy_permission.html
         - dom/media/webm/WebMDecoder.cpp
+        - dom/media/webrtc/transport/stun_socket_filter.cpp
+        - dom/media/webrtc/transport/test/ice_unittest.cpp
         - dom/plugins/base/nsPluginHost.h
         - dom/plugins/ipc/PluginQuirks.cpp
         - dom/push/PushServiceWebSocket.jsm
@@ -197,8 +199,6 @@ avoid-blacklist-and-whitelist:
         - layout/tools/reftest/reftestcommandline.py
         - layout/tools/reftest/runreftest.py
         - layout/tools/reftest/selftest/conftest.py
-        - media/mtransport/stun_socket_filter.cpp
-        - media/mtransport/test/ice_unittest.cpp
         - media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
         - media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
         - mfbt/Attributes.h
diff --git a/tools/rewriting/ThirdPartyPaths.txt b/tools/rewriting/ThirdPartyPaths.txt
index f75e827fba94..9a495821334c 100644
--- a/tools/rewriting/ThirdPartyPaths.txt
+++ b/tools/rewriting/ThirdPartyPaths.txt
@@ -36,6 +36,7 @@ dom/media/platforms/ffmpeg/libav53/
 dom/media/platforms/ffmpeg/libav54/
 dom/media/platforms/ffmpeg/libav55/
 dom/media/webaudio/test/blink/
+dom/media/webrtc/transport/third_party/
 dom/media/webspeech/recognition/endpointer.cc
 dom/media/webspeech/recognition/endpointer.h
 dom/media/webspeech/recognition/energy_endpointer.cc
@@ -119,7 +120,6 @@ media/libvpx/
 media/libwebp/
 media/libyuv/
 media/mp4parse-rust/
-media/mtransport/third_party/
 media/openmax_dl/
 media/openmax_il/
 media/webrtc/signaling/src/sdp/sipcc/
diff --git a/widget/windows/WinCompositorWindowThread.cpp b/widget/windows/WinCompositorWindowThread.cpp
index 8069e071fa5d..1876eb347e85 100644
--- a/widget/windows/WinCompositorWindowThread.cpp
+++ b/widget/windows/WinCompositorWindowThread.cpp
@@ -8,7 +8,7 @@
 #include "WinCompositorWindowThread.h"
 #include "mozilla/layers/SynchronousTask.h"
 #include "mozilla/StaticPtr.h"
-#include "mtransport/runnable_utils.h"
+#include "transport/runnable_utils.h"
 #include "mozilla/StaticPrefs_apz.h"
 
 #if WINVER < 0x0602