Bug 1195881 - Contextual Identity working under e10s. r=tanvi r=sicking r=baku

browser/components/contextualidentity/test/browser/browser.ini

@@ -4,4 +4,3 @@ support-files =
   file_reflect_cookie_into_title.html
 
 [browser_usercontext.js]
-skip-if = e10s

dom/ipc/TabChild.cpp

@@ -835,7 +835,10 @@ TabChild::NotifyTabContextUpdated()
         } else {
           docShell->SetIsApp(OwnAppId());
         }
-        docShell->SetIsSignedPackage(OriginAttributesRef().mSignedPkg);
+
+        OriginAttributes attrs = OriginAttributesRef();
+        docShell->SetIsSignedPackage(attrs.mSignedPkg);
+        docShell->SetUserContextId(attrs.mUserContextId);
     }
 }
 

netwerk/ipc/NeckoParent.cpp

@@ -146,12 +146,20 @@ NeckoParent::GetValidatedAppInfo(const SerializedLoadContext& aSerialized,
         continue;
       }
     }
+
     if (!aSerialized.mOriginAttributes.mSignedPkg.IsEmpty() &&
         aSerialized.mOriginAttributes.mSignedPkg != tabContext.OriginAttributesRef().mSignedPkg) {
       continue;
     }
-    aAttrs = DocShellOriginAttributes(appId, inBrowserElement);
-    aAttrs.mSignedPkg = tabContext.OriginAttributesRef().mSignedPkg;
+    if (aSerialized.mOriginAttributes.mUserContextId != tabContext.OriginAttributesRef().mUserContextId) {
+      continue;
+    }
+    aAttrs = DocShellOriginAttributes();
+    aAttrs.mAppId = appId;
+    aAttrs.mInBrowser = inBrowserElement;
+    aAttrs.mSignedPkg = aSerialized.mOriginAttributes.mSignedPkg;
+    aAttrs.mUserContextId = aSerialized.mOriginAttributes.mUserContextId;
+
     return nullptr;
   }