Bug 1768189 - Part 30: Apply modernize-concat-nested-namespaces to do…

…m/serviceworkers/ServiceWorkerUnregisterCallback.cpp ... r=andi Depends on D145763 Differential Revision: https://phabricator.services.mozilla.com/D145764
dothq · May 9, 2022 · e9a92f2 · e9a92f2
1 parent 0e60dc5
commit e9a92f2
Show file tree

Hide file tree

Showing 25 changed files with 50 additions and 100 deletions.
diff --git a/dom/serviceworkers/ServiceWorkerUnregisterCallback.cpp b/dom/serviceworkers/ServiceWorkerUnregisterCallback.cpp
@@ -6,8 +6,7 @@
 
 #include "ServiceWorkerUnregisterCallback.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 NS_IMPL_ISUPPORTS(UnregisterCallback, nsIServiceWorkerUnregisterCallback)
 
@@ -33,5 +32,4 @@ UnregisterCallback::UnregisterFailed() {
 
 RefPtr<GenericPromise> UnregisterCallback::Promise() const { return mPromise; }
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
diff --git a/dom/serviceworkers/ServiceWorkerUnregisterCallback.h b/dom/serviceworkers/ServiceWorkerUnregisterCallback.h
@@ -11,8 +11,7 @@
 #include "mozilla/RefPtr.h"
 #include "nsIServiceWorkerManager.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class UnregisterCallback final : public nsIServiceWorkerUnregisterCallback {
  public:
@@ -37,7 +36,6 @@ class UnregisterCallback final : public nsIServiceWorkerUnregisterCallback {
   RefPtr<GenericPromise::Private> mPromise;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_ServiceWorkerUnregisterCallback_h
diff --git a/dom/serviceworkers/ServiceWorkerUnregisterJob.cpp b/dom/serviceworkers/ServiceWorkerUnregisterJob.cpp
@@ -12,8 +12,7 @@
 #include "nsThreadUtils.h"
 #include "ServiceWorkerManager.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ServiceWorkerUnregisterJob::PushUnsubscribeCallback final
     : public nsIUnsubscribeResultCallback {
@@ -135,5 +134,4 @@ void ServiceWorkerUnregisterJob::Unregister() {
   Finish(NS_OK);
 }
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
diff --git a/dom/serviceworkers/ServiceWorkerUnregisterJob.h b/dom/serviceworkers/ServiceWorkerUnregisterJob.h
@@ -9,8 +9,7 @@
 
 #include "ServiceWorkerJob.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class ServiceWorkerUnregisterJob final : public ServiceWorkerJob {
  public:
@@ -32,7 +31,6 @@ class ServiceWorkerUnregisterJob final : public ServiceWorkerJob {
   bool mSendToParent;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_serviceworkerunregisterjob_h
diff --git a/dom/serviceworkers/ServiceWorkerUpdateJob.cpp b/dom/serviceworkers/ServiceWorkerUpdateJob.cpp
@@ -17,8 +17,7 @@
 #include "ServiceWorkerScriptCache.h"
 #include "mozilla/dom/WorkerCommon.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 using serviceWorkerScriptCache::OnFailure;
 
@@ -539,5 +538,4 @@ void ServiceWorkerUpdateJob::ContinueAfterInstallEvent(
   mRegistration->TryToActivateAsync();
 }
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
diff --git a/dom/serviceworkers/ServiceWorkerUpdateJob.h b/dom/serviceworkers/ServiceWorkerUpdateJob.h
@@ -12,8 +12,7 @@
 
 #include "nsIRequest.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 namespace serviceWorkerScriptCache {
 enum class OnFailure : uint8_t;
@@ -93,7 +92,6 @@ class ServiceWorkerUpdateJob : public ServiceWorkerJob {
   serviceWorkerScriptCache::OnFailure mOnFailure;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_serviceworkerupdatejob_h
diff --git a/dom/serviceworkers/ServiceWorkerUtils.cpp b/dom/serviceworkers/ServiceWorkerUtils.cpp
@@ -16,8 +16,7 @@
 #include "nsIURL.h"
 #include "nsPrintfCString.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 bool ServiceWorkerRegistrationDataIsValid(
     const ServiceWorkerRegistrationData& aData) {
@@ -144,5 +143,4 @@ void ServiceWorkerScopeAndScriptAreValid(const ClientInfo& aClientInfo,
   }
 }
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
diff --git a/dom/simpledb/SDBRequest.h b/dom/simpledb/SDBRequest.h
@@ -19,8 +19,7 @@
 class nsISDBCallback;
 class nsIVariant;
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class SDBConnection;
 
@@ -58,7 +57,6 @@ class SDBRequest final : public nsISDBRequest {
   NS_DECL_CYCLE_COLLECTION_CLASS(SDBRequest)
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_simpledb_SDBRequest_h
diff --git a/dom/simpledb/SDBResults.h b/dom/simpledb/SDBResults.h
@@ -11,8 +11,7 @@
 #include "nsISupports.h"
 #include "nsString.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class SDBResult : public nsISDBResult {
   nsCString mData;
@@ -27,7 +26,6 @@ class SDBResult : public nsISDBResult {
   NS_DECL_NSISDBRESULT
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_simpledb_SDBResults_h
diff --git a/dom/simpledb/SimpleDBCommon.h b/dom/simpledb/SimpleDBCommon.h
@@ -9,12 +9,10 @@
 
 #include "mozilla/dom/quota/QuotaCommon.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 extern const char* kPrefSimpleDBEnabled;
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_simpledb_SimpledbCommon_h
diff --git a/dom/smil/TimeEvent.cpp b/dom/smil/TimeEvent.cpp
@@ -11,8 +11,7 @@
 #include "nsPresContext.h"
 #include "nsGlobalWindow.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 TimeEvent::TimeEvent(EventTarget* aOwner, nsPresContext* aPresContext,
                      InternalSMILTimeEvent* aEvent)
@@ -46,8 +45,7 @@ void TimeEvent::InitTimeEvent(const nsAString& aType,
   mView = aView ? aView->GetOuterWindow() : nullptr;
 }
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 using namespace mozilla;
 using namespace mozilla::dom;

diff --git a/dom/smil/TimeEvent.h b/dom/smil/TimeEvent.h
@@ -15,8 +15,7 @@
 
 class nsGlobalWindowInner;
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class TimeEvent final : public Event {
  public:
@@ -53,8 +52,7 @@ class TimeEvent final : public Event {
   int32_t mDetail;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 already_AddRefed<mozilla::dom::TimeEvent> NS_NewDOMTimeEvent(
     mozilla::dom::EventTarget* aOwner, nsPresContext* aPresContext,

diff --git a/dom/storage/LocalStorage.h b/dom/storage/LocalStorage.h
@@ -10,8 +10,7 @@
 #include "Storage.h"
 #include "nsWeakReference.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class LocalStorageCache;
 class LocalStorageManager;
@@ -79,7 +78,6 @@ class LocalStorage final : public Storage, public nsSupportsWeakReference {
                 const nsAString& aNewValue);
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_LocalStorage_h
diff --git a/dom/storage/LocalStorageCache.cpp b/dom/storage/LocalStorageCache.cpp
@@ -18,8 +18,7 @@
 #include "nsProxyRelease.h"
 #include "nsThreadUtils.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 #define DOM_STORAGE_CACHE_KEEP_ALIVE_TIME_MS 20000
 
@@ -613,5 +612,4 @@ bool StorageUsage::CheckAndSetETLD1UsageDelta(
   return true;
 }
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
diff --git a/dom/storage/LocalStorageCache.h b/dom/storage/LocalStorageCache.h
@@ -16,8 +16,7 @@
 #include "mozilla/Telemetry.h"
 #include "mozilla/Atomics.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class LocalStorage;
 class LocalStorageCacheChild;
@@ -302,7 +301,6 @@ class StorageUsage : public StorageUsageBridge {
   int64_t mUsage[LocalStorageCache::kDataSetCount];
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_LocalStorageCache_h
diff --git a/dom/storage/LocalStorageManager.cpp b/dom/storage/LocalStorageManager.cpp
@@ -25,8 +25,7 @@
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/dom/LocalStorageCommon.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 using namespace StorageUtils;
 
@@ -452,5 +451,4 @@ LocalStorageManager* LocalStorageManager::Ensure() {
   return sSelf;
 }
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
diff --git a/dom/storage/PartitionedLocalStorage.cpp b/dom/storage/PartitionedLocalStorage.cpp
@@ -10,8 +10,7 @@
 
 #include "mozilla/dom/StorageBinding.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(PartitionedLocalStorage, Storage);
 
@@ -131,5 +130,4 @@ bool PartitionedLocalStorage::IsForkOf(const Storage* aOther) const {
   return mCache == static_cast<const PartitionedLocalStorage*>(aOther)->mCache;
 }
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
diff --git a/dom/storage/PartitionedLocalStorage.h b/dom/storage/PartitionedLocalStorage.h
@@ -11,8 +11,7 @@
 
 class nsIPrincipal;
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class SessionStorageCache;
 
@@ -60,7 +59,6 @@ class PartitionedLocalStorage final : public Storage {
   RefPtr<SessionStorageCache> mCache;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_PartitionedLocalStorage_h
diff --git a/dom/storage/SessionStorage.cpp b/dom/storage/SessionStorage.cpp
@@ -16,8 +16,7 @@
 #include "nsPIDOMWindow.h"
 #include "nsThreadUtils.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(SessionStorage, Storage, mManager);
 
@@ -256,5 +255,4 @@ nsresult SessionStorage::EnsureCacheLoadedOrCloned() const {
   return mManager->LoadData(*StoragePrincipal(), *mCache);
 }
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
diff --git a/dom/storage/SessionStorage.h b/dom/storage/SessionStorage.h
@@ -11,8 +11,7 @@
 
 class nsIPrincipal;
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 class SessionStorageCache;
 class SessionStorageManager;
@@ -82,7 +81,6 @@ class SessionStorage final : public Storage {
   bool mHasPendingStableStateCallback;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
 #endif  // mozilla_dom_SessionStorage_h
diff --git a/dom/storage/SessionStorageCache.cpp b/dom/storage/SessionStorageCache.cpp
@@ -13,8 +13,7 @@
 #include "mozilla/dom/PBackgroundSessionStorageCache.h"
 #include "nsDOMString.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 void SSWriteOptimizer::Enumerate(nsTArray<SSWriteInfo>& aWriteInfos) {
   AssertIsOnOwningThread();
@@ -290,5 +289,4 @@ bool SessionStorageCache::DataSet::ProcessUsageDelta(int64_t aDelta) {
   return true;
 }
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
diff --git a/dom/storage/SessionStorageManager.cpp b/dom/storage/SessionStorageManager.cpp
@@ -29,8 +29,7 @@
 #include "nsTHashMap.h"
 #include "nsThreadUtils.h"
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 using namespace StorageUtils;
 
@@ -985,5 +984,4 @@ void BackgroundSessionStorageManager::RemoveParticipatingActor(
   mParticipatingActors.RemoveElement(aActor);
 }
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom