Backed out changeset c0715e519fb2 (bug 1725734) for causing web-locks…

… wpt failures. CLOSED TREE

dom/base/Navigator.cpp

@@ -43,7 +43,6 @@
 #include "mozilla/dom/MediaSession.h"
 #include "mozilla/dom/WakeLock.h"
 #include "mozilla/dom/power/PowerManagerService.h"
-#include "mozilla/dom/LockManager.h"
 #include "mozilla/dom/MIDIAccessManager.h"
 #include "mozilla/dom/MIDIOptionsBinding.h"
 #include "mozilla/dom/Permissions.h"
@@ -158,7 +157,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Navigator)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMediaSession)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAddonManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWebGpu)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mLocks)
 
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindow)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMediaKeySystemAccessManager)
@@ -240,8 +238,6 @@ void Navigator::Invalidate() {
 
   mWebGpu = nullptr;
 
-  mLocks = nullptr;
-
   mSharePromise = nullptr;
 }
 
@@ -2115,13 +2111,6 @@ webgpu::Instance* Navigator::Gpu() {
   return mWebGpu;
 }
 
-dom::LockManager* Navigator::Locks() {
-  if (!mLocks) {
-    mLocks = new dom::LockManager(GetWindow()->AsGlobal());
-  }
-  return mLocks;
-}
-
 /* static */
 bool Navigator::Webdriver() {
 #ifdef ENABLE_WEBDRIVER

dom/base/Navigator.h

@@ -42,7 +42,6 @@ class ServiceWorkerContainer;
 class DOMRequest;
 class CredentialsContainer;
 class Clipboard;
-class LockManager;
 }  // namespace dom
 namespace webgpu {
 class Instance;
@@ -53,7 +52,8 @@ class Instance;
 // Navigator: Script "navigator" object
 //*****************************************************************************
 
-namespace mozilla::dom {
+namespace mozilla {
+namespace dom {
 
 class Permissions;
 
@@ -206,7 +206,6 @@ class Navigator final : public nsISupports, public nsWrapperCache {
   mozilla::dom::CredentialsContainer* Credentials();
   dom::Clipboard* Clipboard();
   webgpu::Instance* Gpu();
-  dom::LockManager* Locks();
 
   static bool Webdriver();
 
@@ -286,9 +285,9 @@ class Navigator final : public nsISupports, public nsWrapperCache {
   RefPtr<AddonManager> mAddonManager;
   RefPtr<webgpu::Instance> mWebGpu;
   RefPtr<Promise> mSharePromise;  // Web Share API related
-  RefPtr<dom::LockManager> mLocks;
 };
 
+}  // namespace dom
 }  // namespace mozilla
 
 #endif  // mozilla_dom_Navigator_h