Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/dom/storage/StorageUtils.cpp b/dom/storage/StorageUtils.cpp
index 39a69c3f08..cb7a74c73f 100644
--- a/dom/storage/StorageUtils.cpp
+++ b/dom/storage/StorageUtils.cpp
@@ -13,6 +13,7 @@
 #include "nsIURI.h"
 #include "nsNetUtil.h"
 #include "nsPrintfCString.h"
+#include "mozilla/StorageOriginAttributes.h"
 
 namespace mozilla::dom::StorageUtils {
 
@@ -61,16 +62,16 @@ nsCString Scheme0Scope(const nsACString& aOriginSuffix,
                        const nsACString& aOriginNoSuffix) {
   nsCString result;
 
-  OriginAttributes oa;
+  StorageOriginAttributes oa;
   if (!aOriginSuffix.IsEmpty()) {
     DebugOnly<bool> success = oa.PopulateFromSuffix(aOriginSuffix);
     MOZ_ASSERT(success);
   }
 
-  if (oa.mInIsolatedMozBrowser) {
+  if (oa.InIsolatedMozBrowser()) {
     result.AppendInt(0);  // This is the appId to be removed.
     result.Append(':');
-    result.Append(oa.mInIsolatedMozBrowser ? 't' : 'f');
+    result.Append(oa.InIsolatedMozBrowser() ? 't' : 'f');
     result.Append(':');
   }
 
@@ -80,7 +81,7 @@ nsCString Scheme0Scope(const nsACString& aOriginSuffix,
   // with originAttributes and originKey columns) so that switch between
   // schema 1 and 0 always works in both ways.
   nsAutoCString remaining;
-  oa.mInIsolatedMozBrowser = false;
+  oa.SetInIsolatedMozBrowser(false);
   oa.CreateSuffix(remaining);
   if (!remaining.IsEmpty()) {
     MOZ_ASSERT(!aOriginSuffix.IsEmpty());