Bug 1768189 - Part 22: Apply modernize-concat-nested-namespaces to dom/media/webrtc/transport/ipc/WebrtcTCPSocketParent.h ... r=andi

Depends on D145755

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

dom/media/webrtc/transport/ipc/WebrtcTCPSocketParent.h

@@ -13,8 +13,7 @@
 
 class nsIAuthPromptProvider;
 
-namespace mozilla {
+namespace mozilla::net {
-namespace net {
 
 class WebrtcTCPSocket;
 
@@ -54,7 +53,6 @@ class WebrtcTCPSocketParent : public PWebrtcTCPSocketParent,
   RefPtr<WebrtcTCPSocket> mChannel;
 };
 
-}  // namespace net
+}  // namespace mozilla::net
-}  // namespace mozilla
 
 #endif  // mozilla_net_WebrtcTCPSocketParent_h

dom/media/webspeech/recognition/SpeechRecognitionAlternative.h

@@ -14,8 +14,7 @@
 
 #include "mozilla/Attributes.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class SpeechRecognition;
 
@@ -45,7 +44,6 @@ class SpeechRecognitionAlternative final : public nsISupports,
   RefPtr<SpeechRecognition> mParent;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif

dom/media/webspeech/recognition/SpeechRecognitionResult.h

@@ -17,8 +17,7 @@
 
 #include "SpeechRecognitionAlternative.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class SpeechRecognitionResult final : public nsISupports,
                                       public nsWrapperCache {
@@ -50,7 +49,6 @@ class SpeechRecognitionResult final : public nsISupports,
   RefPtr<SpeechRecognition> mParent;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif

dom/media/webspeech/recognition/SpeechRecognitionResultList.h

@@ -16,8 +16,7 @@
 
 #include "SpeechRecognitionResult.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class SpeechRecognition;
 
@@ -49,7 +48,6 @@ class SpeechRecognitionResultList final : public nsISupports,
   RefPtr<SpeechRecognition> mParent;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif

dom/media/webspeech/synth/SpeechSynthesis.h

@@ -20,8 +20,7 @@
 
 class nsIDOMWindow;
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class nsSpeechTask;
 
@@ -85,6 +84,5 @@ class SpeechSynthesis final : public DOMEventTargetHelper,
   uint64_t mInnerID;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 #endif

dom/media/webspeech/synth/SpeechSynthesisUtterance.h

@@ -14,8 +14,7 @@
 
 #include "nsSpeechTask.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class SpeechSynthesisVoice;
 class SpeechSynthesis;
@@ -105,7 +104,6 @@ class SpeechSynthesisUtterance final : public DOMEventTargetHelper {
   RefPtr<SpeechSynthesisVoice> mVoice;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif

dom/media/webspeech/synth/SpeechSynthesisVoice.h

@@ -12,8 +12,7 @@
 #include "nsWrapperCache.h"
 #include "js/TypeDecls.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class nsSynthVoiceRegistry;
 class SpeechSynthesis;
@@ -51,7 +50,6 @@ class SpeechSynthesisVoice final : public nsISupports, public nsWrapperCache {
   nsString mUri;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif

dom/media/webspeech/synth/ipc/SpeechSynthesisChild.h

@@ -10,8 +10,7 @@
 #include "mozilla/dom/PSpeechSynthesisRequestChild.h"
 #include "nsSpeechTask.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class nsSynthVoiceRegistry;
 class SpeechSynthesisRequestChild;
@@ -103,7 +102,6 @@ class SpeechTaskChild : public nsSpeechTask {
   SpeechSynthesisRequestChild* mActor;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif

dom/media/webspeech/synth/ipc/SpeechSynthesisParent.h

@@ -9,8 +9,7 @@
 #include "mozilla/dom/PSpeechSynthesisRequestParent.h"
 #include "nsSpeechTask.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class ContentParent;
 class SpeechTaskParent;
@@ -95,7 +94,6 @@ class SpeechTaskParent : public nsSpeechTask {
   SpeechSynthesisRequestParent* mActor;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif

dom/media/webspeech/synth/nsSynthVoiceRegistry.h

@@ -13,8 +13,7 @@
 
 class nsISpeechService;
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class RemoteVoice;
 class SpeechSynthesisUtterance;
@@ -95,7 +94,6 @@ class nsSynthVoiceRegistry final : public nsISynthVoiceRegistry {
   bool mIsSpeaking;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif

dom/media/webspeech/synth/test/nsFakeSynthServices.h

@@ -14,8 +14,7 @@
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Monitor.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class nsFakeSynthServices : public nsIObserver {
  public:
@@ -38,7 +37,6 @@ class nsFakeSynthServices : public nsIObserver {
   static StaticRefPtr<nsFakeSynthServices> sSingleton;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif

dom/media/webspeech/synth/windows/SapiService.cpp

@@ -17,8 +17,7 @@
 #include "mozilla/ProfilerLabels.h"
 #include "mozilla/StaticPrefs_media.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 StaticRefPtr<SapiService> SapiService::sSingleton;
 
@@ -433,5 +432,4 @@ already_AddRefed<SapiService> SapiService::GetInstanceForService() {
   return sapiService.forget();
 }
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla

dom/media/webspeech/synth/windows/SapiService.h

@@ -16,8 +16,7 @@
 #include <windows.h>
 #include <sapi.h>
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class SapiCallback;
 
@@ -49,7 +48,6 @@ class SapiService final : public nsISpeechService, public nsIObserver {
   static StaticRefPtr<SapiService> sSingleton;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif

dom/media/webvtt/TextTrack.h

@@ -14,8 +14,7 @@
 #include "nsString.h"
 #include "TimeUnits.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class TextTrackList;
 class TextTrackCue;
@@ -144,7 +143,6 @@ class TextTrack final : public DOMEventTargetHelper {
   TextTrackSource mTextTrackSource;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif  // mozilla_dom_TextTrack_h

dom/media/webvtt/TextTrackCue.h

@@ -17,8 +17,7 @@
 #include "mozilla/dom/TextTrack.h"
 #include "mozilla/StateWatching.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class Document;
 class HTMLTrackElement;
@@ -338,7 +337,6 @@ class TextTrackCue final : public DOMEventTargetHelper {
   WatchManager<TextTrackCue> mWatchManager;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif  // mozilla_dom_TextTrackCue_h

dom/media/webvtt/TextTrackList.h

@@ -11,8 +11,7 @@
 #include "mozilla/dom/TextTrack.h"
 #include "nsCycleCollectionParticipant.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class Event;
 class HTMLMediaElement;
@@ -75,7 +74,6 @@ class TextTrackList final : public DOMEventTargetHelper {
                                          const nsAString& aEventName);
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif  // mozilla_dom_TextTrackList_h

dom/media/webvtt/TextTrackRegion.h

@@ -15,8 +15,7 @@
 #include "mozilla/dom/VTTRegionBinding.h"
 #include "mozilla/Preferences.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class GlobalObject;
 class TextTrack;
@@ -134,7 +133,6 @@ class TextTrackRegion final : public nsISupports, public nsWrapperCache {
   }
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif  // mozilla_dom_TextTrackRegion_h

dom/media/webvtt/WebVTTListener.h

@@ -15,8 +15,7 @@
 
 class nsIWebVTTParserWrapper;
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class HTMLTrackElement;
 
@@ -65,7 +64,6 @@ class WebVTTListener final : public nsIWebVTTListener,
   bool mCancel = false;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif  // mozilla_dom_WebVTTListener_h

dom/messagechannel/MessagePort.h

@@ -19,8 +19,7 @@
 
 class nsIGlobalObject;
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class MessageData;
 class MessagePortChild;
@@ -229,7 +228,6 @@ class MessagePort final : public DOMEventTargetHelper {
   bool mHasBeenTransferredOrClosed;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif  // mozilla_dom_MessagePort_h

dom/messagechannel/MessagePortChild.h

@@ -11,8 +11,7 @@
 #include "mozilla/dom/PMessagePortChild.h"
 #include "nsISupportsImpl.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class MessagePort;
 
@@ -41,7 +40,6 @@ class MessagePortChild final : public PMessagePortChild {
   MessagePort* mPort;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif  // mozilla_dom_MessagePortChild_h

dom/messagechannel/MessagePortParent.h

@@ -11,8 +11,7 @@
 #include "mozilla/dom/PMessagePortParent.h"
 #include "mozilla/dom/quota/CheckedUnsafePtr.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class MessagePortService;
 
@@ -57,7 +56,6 @@ class MessagePortParent final
   bool mCanSendData;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif  // mozilla_dom_MessagePortParent_h

dom/messagechannel/MessagePortService.h

@@ -11,8 +11,7 @@
 #include "nsHashKeys.h"
 #include "nsISupportsImpl.h"
 
-namespace mozilla {
+namespace mozilla::dom {
-namespace dom {
 
 class MessagePortParent;
 class SharedMessageBody;
@@ -56,7 +55,6 @@ class MessagePortService final {
   nsClassHashtable<nsIDHashKey, MessagePortServiceData> mPorts;
 };
 
-}  // namespace dom
+}  // namespace mozilla::dom
-}  // namespace mozilla
 
 #endif  // mozilla_dom_MessagePortService_h

dom/network/ConnectionMainThread.h

@@ -11,9 +11,7 @@
 #include "mozilla/Hal.h"
 #include "mozilla/Observer.h"
 
-namespace mozilla {
+namespace mozilla::dom::network {
-namespace dom {
-namespace network {
 
 class ConnectionMainThread final : public Connection,
                                    public hal::NetworkObserver {
@@ -37,8 +35,6 @@ class ConnectionMainThread final : public Connection,
                              bool aNotify);
 };
 
-}  // namespace network
+}  // namespace mozilla::dom::network
-}  // namespace dom
-}  // namespace mozilla
 
 #endif  // mozilla_dom_network_ConnectionMainThread_h

dom/network/ConnectionWorker.h

@@ -9,9 +9,7 @@
 
 #include "Connection.h"
 
-namespace mozilla {
+namespace mozilla::dom::network {
-namespace dom {
-namespace network {
 
 class ConnectionProxy;
 
@@ -31,8 +29,6 @@ class ConnectionWorker final : public Connection {
   RefPtr<ConnectionProxy> mProxy;
 };
 
-}  // namespace network
+}  // namespace mozilla::dom::network
-}  // namespace dom
-}  // namespace mozilla
 
 #endif  // mozilla_dom_network_ConnectionWorker_h

dom/network/Constants.h

@@ -10,16 +10,12 @@
 /**
  * A set of constants to be used by network backends.
  */
-namespace mozilla {
+namespace mozilla::dom::network {
-namespace dom {
-namespace network {
 
 static const uint32_t kDefaultType = 5;  // ConnectionType::None
 static const bool kDefaultIsWifi = false;
 static const uint32_t kDefaultDHCPGateway = 0;
 
-}  // namespace network
+}  // namespace mozilla::dom::network
-}  // namespace dom
-}  // namespace mozilla
 
 #endif  // mozilla_dom_network_Constants_h__