Bug 1768189 - Part 8: Apply modernize-concat-nested-namespaces to dom/clients/manager/ClientHandleParent.h ... r=andi

Depends on D145741

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

dom/clients/manager/ClientHandleParent.h

@@ -8,8 +8,7 @@
 
 #include "mozilla/dom/PClientHandleParent.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ClientManagerService;
 class ClientSourceParent;
@@ -59,7 +58,6 @@ class ClientHandleParent final : public PClientHandleParent {
   RefPtr<SourcePromise> EnsureSource();
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // _mozilla_dom_ClientHandleParent_h

dom/clients/manager/ClientManagerChild.h

@@ -9,8 +9,7 @@
 #include "ClientThing.h"
 #include "mozilla/dom/PClientManagerChild.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class IPCWorkerRef;
 class WorkerPrivate;
@@ -62,7 +61,6 @@ class ClientManagerChild final : public PClientManagerChild {
   mozilla::dom::WorkerPrivate* GetWorkerPrivate() const;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // _mozilla_dom_ClientManagerChild_h

dom/clients/manager/ClientManagerOpChild.h

@@ -10,8 +10,7 @@
 #include "mozilla/dom/PClientManagerOpChild.h"
 #include "mozilla/MozPromise.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ClientManager;
 
@@ -33,7 +32,6 @@ class ClientManagerOpChild final : public PClientManagerOpChild {
   ~ClientManagerOpChild();
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // _mozilla_dom_ClientManagerOpChild_h

dom/clients/manager/ClientManagerOpParent.h

@@ -9,8 +9,7 @@
 #include "mozilla/dom/PClientManagerOpParent.h"
 #include "ClientOpPromise.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ClientManagerService;
 
@@ -31,7 +30,6 @@ class ClientManagerOpParent final : public PClientManagerOpParent {
   void Init(const ClientOpConstructorArgs& aArgs);
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // _mozilla_dom_ClientManagerOpParent_h

dom/clients/manager/ClientManagerParent.h

@@ -8,8 +8,7 @@
 
 #include "mozilla/dom/PClientManagerParent.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ClientManagerService;
 
@@ -65,7 +64,6 @@ class ClientManagerParent final : public PClientManagerParent {
   void Init();
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // _mozilla_dom_ClientManagerParent_h

dom/clients/manager/ClientNavigateOpChild.h

@@ -9,8 +9,7 @@
 #include "mozilla/dom/PClientNavigateOpChild.h"
 #include "ClientOpPromise.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ClientNavigateOpChild final : public PClientNavigateOpChild {
   MozPromiseRequestHolder<ClientOpPromise> mPromiseRequestHolder;
@@ -29,7 +28,6 @@ class ClientNavigateOpChild final : public PClientNavigateOpChild {
   void Init(const ClientNavigateOpConstructorArgs& aArgs);
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // _mozilla_dom_ClientNavigateOpChild_h

dom/clients/manager/ClientNavigateOpParent.h

@@ -9,8 +9,7 @@
 #include "mozilla/dom/ClientOpPromise.h"
 #include "mozilla/dom/PClientNavigateOpParent.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ClientNavigateOpParent final : public PClientNavigateOpParent {
   RefPtr<ClientOpPromise::Private> mPromise;
@@ -28,7 +27,6 @@ class ClientNavigateOpParent final : public PClientNavigateOpParent {
   ~ClientNavigateOpParent();
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // _mozilla_dom_ClientNavigateOpParent_h

dom/clients/manager/ClientOpenWindowUtils.h

@@ -9,8 +9,7 @@
 #include "ClientOpPromise.h"
 #include "mozilla/dom/ClientIPCTypes.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 using BrowsingContextCallbackReceivedPromise =
     MozPromise<RefPtr<BrowsingContext>, CopyableErrorResult, false>;
@@ -18,7 +17,6 @@ using BrowsingContextCallbackReceivedPromise =
 [[nodiscard]] RefPtr<ClientOpPromise> ClientOpenWindow(
     const ClientOpenWindowArgs& aArgs);
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // _mozilla_dom_ClientOpenWindowUtils_h

dom/clients/manager/ClientSourceChild.h

@@ -8,8 +8,7 @@
 
 #include "mozilla/dom/PClientSourceChild.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ClientSource;
 class ClientSourceConstructorArgs;
@@ -44,7 +43,6 @@ class ClientSourceChild final : public PClientSourceChild {
   void MaybeStartTeardown();
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // _mozilla_dom_ClientSourceChild_h

dom/clients/manager/ClientSourceOpChild.h

@@ -10,8 +10,7 @@
 #include "mozilla/dom/PClientSourceOpChild.h"
 #include "ClientOpPromise.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ClientSource;
 
@@ -41,7 +40,6 @@ class ClientSourceOpChild final : public PClientSourceOpChild {
   FlippedOnce<false> mInitialized;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // _mozilla_dom_ClientSourceOpChild_h

dom/clients/manager/ClientSourceOpParent.h

@@ -9,8 +9,7 @@
 #include "mozilla/dom/ClientOpPromise.h"
 #include "mozilla/dom/PClientSourceOpParent.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ClientSourceOpParent final : public PClientSourceOpParent {
   const ClientOpConstructorArgs mArgs;
@@ -31,7 +30,6 @@ class ClientSourceOpParent final : public PClientSourceOpParent {
   ~ClientSourceOpParent();
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // _mozilla_dom_ClientSourceOpParent_h

dom/clients/manager/ClientSourceParent.h

@@ -13,8 +13,7 @@
 #include "mozilla/dom/ipc/IdType.h"
 #include "mozilla/MozPromise.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ClientHandleParent;
 class ClientManagerService;
@@ -85,7 +84,6 @@ class ClientSourceParent final : public PClientSourceParent {
   RefPtr<ClientOpPromise> StartOp(ClientOpConstructorArgs&& aArgs);
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // _mozilla_dom_ClientSourceParent_h

dom/clients/manager/ClientState.h

@@ -15,8 +15,7 @@
 #include "mozilla/Variant.h"
 #include "nsContentUtils.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class IPCClientState;
 class IPCClientWindowState;
@@ -121,7 +120,6 @@ class ClientState final {
   const IPCClientState ToIPC() const;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // _mozilla_dom_ClientState_h

dom/clients/manager/ClientThing.h

@@ -8,8 +8,7 @@
 
 #include "nsTArray.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 // Base class representing various Client "things" such as ClientHandle,
 // ClientSource, and ClientManager.  Currently it provides a common set
@@ -134,7 +133,6 @@ class ClientThing {
   }
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // _mozilla_dom_ClientThing_h

dom/console/Console.h

@@ -21,8 +21,7 @@ class nsIGlobalObject;
 class nsPIDOMWindowInner;
 class nsIStackFrame;
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class AnyCallback;
 class ConsoleCallData;
@@ -444,7 +443,6 @@ class Console final : public nsIObserver, public nsSupportsWeakReference {
   friend class MainThreadConsoleData;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif /* mozilla_dom_Console_h */

dom/console/ConsoleCommon.h

@@ -10,9 +10,7 @@
 #include "jsapi.h"
 #include "nsString.h"
 
-namespace mozilla {
-namespace dom {
-namespace ConsoleCommon {
+namespace mozilla::dom::ConsoleCommon {
 
 // This class is used to clear any exception at the end of this method.
 class MOZ_RAII ClearException {
@@ -25,8 +23,6 @@ class MOZ_RAII ClearException {
   JSContext* mCx;
 };
 
-}  // namespace ConsoleCommon
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom::ConsoleCommon
 
 #endif /* mozilla_dom_ConsoleCommon_h */

dom/console/ConsoleInstance.h

@@ -9,8 +9,7 @@
 
 #include "mozilla/dom/Console.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ConsoleInstance final : public nsISupports, public nsWrapperCache {
  public:
@@ -110,7 +109,6 @@ class ConsoleInstance final : public nsISupports, public nsWrapperCache {
   RefPtr<Console> mConsole;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_ConsoleInstance_h

dom/console/ConsoleUtils.h

@@ -11,8 +11,7 @@
 #include "nsISupportsImpl.h"
 #include "nsString.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ConsoleUtils final {
  public:
@@ -49,7 +48,6 @@ class ConsoleUtils final {
   RefPtr<JSObjectHolder> mSandbox;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif /* mozilla_dom_ConsoleUtils_h */

dom/console/nsIConsoleReportCollector.h

@@ -20,11 +20,9 @@
     }                                                \
   }
 
-namespace mozilla {
-namespace net {
+namespace mozilla::net {
 class ConsoleReportCollected;
-}
-}  // namespace mozilla
+}  // namespace mozilla::net
 
 // An interface for saving reports until we can flush them to the correct
 // window at a later time.

dom/credentialmanagement/Credential.h

@@ -12,8 +12,7 @@
 #include "nsPIDOMWindow.h"
 #include "nsWrapperCache.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class Credential : public nsISupports, public nsWrapperCache {
  public:
@@ -46,7 +45,6 @@ class Credential : public nsISupports, public nsWrapperCache {
   nsAutoString mType;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_Credential_h

dom/credentialmanagement/CredentialsContainer.h

@@ -9,8 +9,7 @@
 
 #include "mozilla/dom/CredentialManagementBinding.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class WebAuthnManager;
 
@@ -46,7 +45,6 @@ class CredentialsContainer final : public nsISupports, public nsWrapperCache {
   RefPtr<WebAuthnManager> mManager;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_CredentialsContainer_h

dom/crypto/CryptoBuffer.h

@@ -11,8 +11,7 @@
 #include "seccomon.h"
 #include "mozilla/dom/TypedArray.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ArrayBufferViewOrArrayBuffer;
 class OwningArrayBufferViewOrArrayBuffer;
@@ -51,7 +50,6 @@ class CryptoBuffer : public FallibleTArray<uint8_t> {
   }
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_CryptoBuffer_h

dom/crypto/KeyAlgorithmProxy.h

@@ -25,8 +25,7 @@ struct JSStructuredCloneWriter;
 
 #define KEY_ALGORITHM_SC_VERSION 0x00000001
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 // A heap-safe variant of RsaHashedKeyAlgorithm
 // The only difference is that it uses CryptoBuffer instead of Uint8Array
@@ -121,7 +120,6 @@ struct KeyAlgorithmProxy {
   }
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_KeyAlgorithmProxy_h

dom/crypto/WebCryptoTask.h

@@ -14,8 +14,7 @@
 #include "mozilla/dom/SubtleCryptoBinding.h"
 #include "nsIGlobalObject.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ThreadSafeWorkerRef;
 
@@ -201,7 +200,6 @@ class GenerateAsymmetricKeyTask : public WebCryptoTask {
   UniqueSECKEYPrivateKey mPrivateKey;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_WebCryptoTask_h

dom/debugger/CallbackDebuggerNotification.h

@@ -10,8 +10,7 @@
 #include "DebuggerNotification.h"
 #include "DebuggerNotificationManager.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class CallbackDebuggerNotification : public DebuggerNotification {
  public:
@@ -73,7 +72,6 @@ class MOZ_RAII CallbackDebuggerNotificationGuard final {
   DebuggerNotificationType mType;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_CallbackDebuggerNotification_h