Remove some additonal Contextual Identity referencesv2.2

4 files changed, 1 insertions, 12 deletions

diff --git a/components/sessionstore/ContentRestore.jsm b/components/sessionstore/ContentRestore.jsm
index d4972bc..8b38676 100644
--- a/components/sessionstore/ContentRestore.jsm
+++ b/components/sessionstore/ContentRestore.jsm
@@ -208,10 +208,6 @@ ContentRestoreInternal.prototype = {
                                   ? Utils.deserializePrincipal(loadArguments.triggeringPrincipal)
                                   : null;
 
-        if (loadArguments.userContextId) {
-          webNavigation.setOriginAttributesBeforeLoading({ userContextId: loadArguments.userContextId });
-        }
-
         webNavigation.loadURIWithOptions(loadArguments.uri, loadArguments.flags,
                                          referrer, referrerPolicy, postData,
                                          null, null, triggeringPrincipal);
diff --git a/components/sessionstore/SessionHistory.jsm b/components/sessionstore/SessionHistory.jsm
index 3d28d87..907a608 100644
--- a/components/sessionstore/SessionHistory.jsm
+++ b/components/sessionstore/SessionHistory.jsm
@@ -64,11 +64,10 @@ var SessionHistoryInternal = {
    *        The docShell that owns the session history.
    */
   collect: function (docShell) {
-    let loadContext = docShell.QueryInterface(Ci.nsILoadContext);
     let webNavigation = docShell.QueryInterface(Ci.nsIWebNavigation);
     let history = webNavigation.sessionHistory.QueryInterface(Ci.nsISHistoryInternal);
 
-    let data = {entries: [], userContextId: loadContext.originAttributes.userContextId };
+    let data = {entries: []};
 
     if (history && history.count > 0) {
       // Loop over the transaction linked list directly so we can get the
diff --git a/components/sessionstore/TabState.jsm b/components/sessionstore/TabState.jsm
index f22c52f..ac84603 100644
--- a/components/sessionstore/TabState.jsm
+++ b/components/sessionstore/TabState.jsm
@@ -181,10 +181,6 @@ var TabStateInternal = {
       if (key === "history") {
         tabData.entries = value.entries;
 
-        if (value.hasOwnProperty("userContextId")) {
-          tabData.userContextId = value.userContextId;
-        }
-
         if (value.hasOwnProperty("index")) {
           tabData.index = value.index;
         }
diff --git a/components/webextensions/ext-tabs.js b/components/webextensions/ext-tabs.js
index bb575aa..d46112c 100644
--- a/components/webextensions/ext-tabs.js
+++ b/components/webextensions/ext-tabs.js
@@ -545,8 +545,6 @@ extensions.registerSchemaAPI("tabs", "addon_parent", context => {
               if (!containerId) {
                 return Promise.reject({message: `No cookie store exists with ID ${createProperties.cookieStoreId}`});
               }
-
-              options.userContextId = containerId;
             }
           }