Bug 1664898 - move media/mtransport to media/transport. r=ng

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

.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/.*

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 ||

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',

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;

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"

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'],
     },
 ]

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',

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',

dom/media/moz.build

@@ -208,8 +208,8 @@ EXPORTS.mozilla.media.webrtc += [
 ]
 
 if not CONFIG['MOZ_WEBRTC']:
-  EXPORTS.mtransport += [
+  EXPORTS.transport += [
-      '../../media/mtransport/runnable_utils.h',
+      'webrtc/transport/runnable_utils.h',
   ]
 
 EXPORTS.mozilla.dom += [

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

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

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 {

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 <vector>
 
 namespace mozilla {

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',

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'

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 = [
+transport_cppsrcs = [
-    '/media/mtransport/%s' % s for s in sorted(mtransport_lcppsrcs)
+    '/dom/media/webrtc/transport/%s' % s for s in sorted(transport_lcppsrcs)
 ]
 
 LOCAL_INCLUDES += [
-    '/media/mtransport/',
+    '/dom/media/webrtc/transport/',
-    '/media/mtransport/third_party/',
+    '/dom/media/webrtc/transport/third_party/',
-    '/media/mtransport/third_party/nICEr/src/crypto',
+    '/dom/media/webrtc/transport/third_party/nICEr/src/crypto',
-    '/media/mtransport/third_party/nICEr/src/ice',
+    '/dom/media/webrtc/transport/third_party/nICEr/src/ice',
-    '/media/mtransport/third_party/nICEr/src/net',
+    '/dom/media/webrtc/transport/third_party/nICEr/src/net',
-    '/media/mtransport/third_party/nICEr/src/stun',
+    '/dom/media/webrtc/transport/third_party/nICEr/src/stun',
-    '/media/mtransport/third_party/nICEr/src/util',
+    '/dom/media/webrtc/transport/third_party/nICEr/src/util',
-    '/media/mtransport/third_party/nrappkit/src/event',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/event',
-    '/media/mtransport/third_party/nrappkit/src/log',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/log',
-    '/media/mtransport/third_party/nrappkit/src/plugin',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/plugin',
-    '/media/mtransport/third_party/nrappkit/src/port/generic/include',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/port/generic/include',
-    '/media/mtransport/third_party/nrappkit/src/registry',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/registry',
-    '/media/mtransport/third_party/nrappkit/src/share',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/share',
-    '/media/mtransport/third_party/nrappkit/src/stats',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/stats',
-    '/media/mtransport/third_party/nrappkit/src/util/libekr',
+    '/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'):

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'

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 {

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 {

dom/media/webrtc/transport/ipc/StunAddrsRequestParent.cpp

@@ -7,9 +7,9 @@
 #include "../runnable_utils.h"
 #include "nsNetUtil.h"
 
-#include "mtransport/nricectx.h"
+#include "transport/nricectx.h"
-#include "mtransport/nricemediastream.h"  // needed only for including nricectx.h
+#include "transport/nricemediastream.h"  // needed only for including nricectx.h
-#include "mtransport/nricestunaddr.h"
+#include "transport/nricestunaddr.h"
 
 #include "../mdns_service/mdns_service.h"
 

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 {
 

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',
+    '/dom/media/webrtc/transport/third_party/nICEr/src/net',
-    '/media/mtransport/third_party/nrappkit/src/util/libekr',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr',
     '/media/webrtc',
     '/media/webrtc/signaling/src/peerconnection',
     '/netwerk/base',

dom/media/webrtc/transport/moz.build

@@ -10,9 +10,9 @@ with Files("**"):
 include("/ipc/chromium/chromium-config.mozbuild")
 
 DIRS += [
-    '/media/mtransport/third_party',
+    '/dom/media/webrtc/transport/third_party',
-    '/media/mtransport/build',
+    '/dom/media/webrtc/transport/build',
-    '/media/mtransport/ipc',
+    '/dom/media/webrtc/transport/ipc',
 ]
 
 # Add libFuzzer configuration directives

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 {
 

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);

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/',
+    '/dom/media/webrtc/transport/',
-    '/media/mtransport/third_party/',
+    '/dom/media/webrtc/transport/third_party/',
-    '/media/mtransport/third_party/nICEr/src/crypto',
+    '/dom/media/webrtc/transport/third_party/nICEr/src/crypto',
-    '/media/mtransport/third_party/nICEr/src/ice',
+    '/dom/media/webrtc/transport/third_party/nICEr/src/ice',
-    '/media/mtransport/third_party/nICEr/src/net',
+    '/dom/media/webrtc/transport/third_party/nICEr/src/net',
-    '/media/mtransport/third_party/nICEr/src/stun',
+    '/dom/media/webrtc/transport/third_party/nICEr/src/stun',
-    '/media/mtransport/third_party/nICEr/src/util',
+    '/dom/media/webrtc/transport/third_party/nICEr/src/util',
-    '/media/mtransport/third_party/nrappkit/src/event',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/event',
-    '/media/mtransport/third_party/nrappkit/src/log',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/log',
-    '/media/mtransport/third_party/nrappkit/src/plugin',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/plugin',
-    '/media/mtransport/third_party/nrappkit/src/port/generic/include',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/port/generic/include',
-    '/media/mtransport/third_party/nrappkit/src/registry',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/registry',
-    '/media/mtransport/third_party/nrappkit/src/share',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/share',
-    '/media/mtransport/third_party/nrappkit/src/stats',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/stats',
-    '/media/mtransport/third_party/nrappkit/src/util/',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/util/',
-    '/media/mtransport/third_party/nrappkit/src/util/libekr',
+    '/dom/media/webrtc/transport/third_party/nrappkit/src/util/libekr',
     '/netwerk/sctp/src/',
     '/xpcom/tests/'
 ]