Backed out changeset 3732b1dad003 (bug 1221049) for bustage

docshell/base/LoadContext.h

@@ -77,7 +77,7 @@ public:
               bool aIsContent,
               bool aUsePrivateBrowsing,
               bool aUseRemoteTabs,
-              const OriginAttributes& aAttrs)
+              OriginAttributes& aAttrs)
     : mTopFrameElement(do_GetWeakReference(aTopFrameElement))
     , mNestedFrameId(0)
     , mIsContent(aIsContent)

dom/ipc/ContentParent.cpp

@@ -5188,7 +5188,8 @@ ContentParent::AllocPOfflineCacheUpdateParent(const URIParams& aManifestURI,
     }
     RefPtr<mozilla::docshell::OfflineCacheUpdateParent> update =
         new mozilla::docshell::OfflineCacheUpdateParent(
-            tabContext.OriginAttributesRef());
+            tabContext.OwnOrContainingAppId(),
+            tabContext.IsBrowserElement());
     // Use this reference as the IPDL reference.
     return update.forget().take();
 }

dom/ipc/TabParent.cpp

@@ -2822,11 +2822,13 @@ TabParent::GetLoadContext()
   if (mLoadContext) {
     loadContext = mLoadContext;
   } else {
+    // TODO Bug 1191740 - Add OriginAttributes in TabContext
+    OriginAttributes attrs = OriginAttributes(OwnOrContainingAppId(), IsBrowserElement());
     loadContext = new LoadContext(GetOwnerElement(),
                                   true /* aIsContent */,
                                   mChromeFlags & nsIWebBrowserChrome::CHROME_PRIVATE_WINDOW,
                                   mChromeFlags & nsIWebBrowserChrome::CHROME_REMOTE_WINDOW,
-                                  OriginAttributesRef());
+                                  attrs);
     mLoadContext = loadContext;
   }
   return loadContext.forget();

uriloader/prefetch/OfflineCacheUpdateParent.cpp

@@ -52,9 +52,11 @@ NS_IMPL_ISUPPORTS(OfflineCacheUpdateParent,
 // OfflineCacheUpdateParent <public>
 //-----------------------------------------------------------------------------
 
-OfflineCacheUpdateParent::OfflineCacheUpdateParent(const OriginAttributes& aAttrs)
+// TODO: Bug 1191740 - Add OriginAttributes in TabContext
+OfflineCacheUpdateParent::OfflineCacheUpdateParent(uint32_t aAppId,
+                                                   bool aIsInBrowser)
     : mIPCClosed(false)
-    , mOriginAttributes(aAttrs)
+    , mOriginAttributes(aAppId, aIsInBrowser)
 {
     // Make sure the service has been initialized
     nsOfflineCacheUpdateService::EnsureService();

uriloader/prefetch/OfflineCacheUpdateParent.h

@@ -45,7 +45,7 @@ public:
       mIPCClosed = true;
     }
 
-    OfflineCacheUpdateParent(const mozilla::OriginAttributes& aAttrs);
+    OfflineCacheUpdateParent(uint32_t aAppId, bool aIsInBrowser);
 
     virtual void ActorDestroy(ActorDestroyReason aWhy) override;
 private: