Backed out 4 changesets (bug 1315905) for continued mochitest assertions a=me
authorWes Kocher <wkocher@mozilla.com>
Thu, 24 Nov 2016 21:58:40 -0800
changeset 352649 55b599ca3530c8286f6ad15405d99d2bcaecfbd1
parent 352648 12a7e9d627b5ef91b8c1a9061012cd48ae1a6df0
child 352650 84a91fbd335a5c562c67a48372cadbd83496f8a0
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1315905
milestone52.0a2
backs outfaf338a9891a7af3a9c128c634f0a9e958bfb2da
3722df768f32768071ab28c8d0880194cf80551b
cd6fe5a803f3776a2d89a9a484d36f9183b205dd
8342b7cca4bc07f9f075fe230c1fd487409d3d3d
Backed out 4 changesets (bug 1315905) for continued mochitest assertions a=me Backed out changeset faf338a9891a (bug 1315905) Backed out changeset 3722df768f32 (bug 1315905) Backed out changeset cd6fe5a803f3 (bug 1315905) Backed out changeset 8342b7cca4bc (bug 1315905)
caps/BasePrincipal.cpp
caps/BasePrincipal.h
dom/base/ChromeUtils.cpp
dom/base/ChromeUtils.h
dom/base/test/chrome/window_swapFrameLoaders.xul
dom/base/test/test_bug1022229.html
dom/base/test/test_ipc_messagemanager_blob.html
dom/base/test/test_messagemanager_principal.html
dom/base/test/test_messagemanager_send_principal.html
dom/base/test/test_messagemanager_targetchain.html
dom/base/test/test_mozbrowser_apis_allowed.html
dom/base/test/test_mozbrowser_apis_blocked.html
dom/base/test/test_postMessage_originAttributes.html
dom/browser-element/mochitest/browserElementTestHelpers.js
dom/crypto/test/test_indexedDB.html
dom/devicestorage/test/test_app_permissions.html
dom/devicestorage/test/test_fs_app_permissions.html
dom/events/test/test_bug1096146.html
dom/events/test/test_dom_before_after_keyboard_event.html
dom/events/test/test_dom_before_after_keyboard_event_remote.html
dom/html/test/test_ignoreuserfocus.html
dom/indexedDB/test/test_message_manager_ipc.html
dom/inputmethod/mochitest/inputmethod_common.js
dom/ipc/tests/test_CrashService_crash.html
dom/ipc/tests/test_blob_sliced_from_child_process.html
dom/ipc/tests/test_blob_sliced_from_parent_process.html
dom/ipc/tests/test_bug1086684.html
dom/ipc/tests/test_child_docshell.html
dom/ipc/tests/test_cpow_cookies.html
dom/permission/tests/test_browser.html
dom/permission/tests/test_embed-apps.html
dom/permission/tests/test_input-manage.html
dom/presentation/tests/mochitest/test_presentation_1ua_connection_wentaway.js
dom/presentation/tests/mochitest/test_presentation_1ua_sender_and_receiver.js
dom/presentation/tests/mochitest/test_presentation_dc_receiver.html
dom/presentation/tests/mochitest/test_presentation_dc_receiver_oop.html
dom/presentation/tests/mochitest/test_presentation_receiver_auxiliary_navigation.js
dom/presentation/tests/mochitest/test_presentation_tcp_receiver.html
dom/presentation/tests/mochitest/test_presentation_tcp_receiver_establish_connection_error.html
dom/presentation/tests/mochitest/test_presentation_tcp_receiver_establish_connection_unknown_content_type.js
dom/presentation/tests/mochitest/test_presentation_tcp_receiver_oop.html
dom/presentation/tests/mochitest/test_presentation_terminate.js
dom/presentation/tests/mochitest/test_presentation_terminate_establish_connection_error.js
dom/tests/browser/browser_frame_elements.js
netwerk/ipc/NeckoParent.cpp
netwerk/ipc/NeckoParent.h
--- a/caps/BasePrincipal.cpp
+++ b/caps/BasePrincipal.cpp
@@ -187,28 +187,16 @@ OriginAttributes::CreateSuffix(nsACStrin
 // In debug builds, check the whole string for illegal characters too (just in case).
 #ifdef DEBUG
   nsAutoCString str;
   str.Assign(aStr);
   MOZ_ASSERT(str.FindCharInSet(dom::quota::QuotaManager::kReplaceChars) == kNotFound);
 #endif
 }
 
-void
-OriginAttributes::CreateAnonymizedSuffix(nsACString& aStr) const
-{
-  OriginAttributes attrs = *this;
-
-  if (!attrs.mFirstPartyDomain.IsEmpty()) {
-    attrs.mFirstPartyDomain.AssignLiteral("_anonymizedFirstPartyDomain_");
-  }
-
-  attrs.CreateSuffix(aStr);
-}
-
 namespace {
 
 class MOZ_STACK_CLASS PopulateFromSuffixIterator final
   : public URLParams::ForEachIterator
 {
 public:
   explicit PopulateFromSuffixIterator(OriginAttributes* aOriginAttributes)
     : mOriginAttributes(aOriginAttributes)
--- a/caps/BasePrincipal.h
+++ b/caps/BasePrincipal.h
@@ -43,26 +43,22 @@ public:
   {
     return !(*this == aOther);
   }
 
   // Serializes/Deserializes non-default values into the suffix format, i.e.
   // |!key1=value1&key2=value2|. If there are no non-default attributes, this
   // returns an empty string.
   void CreateSuffix(nsACString& aStr) const;
-
-  // Don't use this method for anything else than debugging!
-  void CreateAnonymizedSuffix(nsACString& aStr) const;
-
   MOZ_MUST_USE bool PopulateFromSuffix(const nsACString& aStr);
 
   // Populates the attributes from a string like
   // |uri!key1=value1&key2=value2| and returns the uri without the suffix.
   MOZ_MUST_USE bool PopulateFromOrigin(const nsACString& aOrigin,
-                                       nsACString& aOriginNoSuffix);
+                          nsACString& aOriginNoSuffix);
 
   // Helper function to match mIsPrivateBrowsing to existing private browsing
   // flags. Once all other flags are removed, this can be removed too.
   void SyncAttributesWithPrivateBrowsing(bool aInPrivateBrowsing);
 
   void SetFromGenericAttributes(const GenericOriginAttributes& aAttrs);
 
   // check if "privacy.firstparty.isolate" is enabled.
--- a/dom/base/ChromeUtils.cpp
+++ b/dom/base/ChromeUtils.cpp
@@ -170,23 +170,16 @@ ChromeUtils::FillNonDefaultOriginAttribu
 }
 
 
 /* static */ bool
 ChromeUtils::IsOriginAttributesEqual(dom::GlobalObject& aGlobal,
                                      const dom::OriginAttributesDictionary& aA,
                                      const dom::OriginAttributesDictionary& aB)
 {
-  return IsOriginAttributesEqual(aA, aB);
-}
-
-/* static */ bool
-ChromeUtils::IsOriginAttributesEqual(const dom::OriginAttributesDictionary& aA,
-                                     const dom::OriginAttributesDictionary& aB)
-{
   return aA.mAddonId == aB.mAddonId &&
          aA.mAppId == aB.mAppId &&
          aA.mInIsolatedMozBrowser == aB.mInIsolatedMozBrowser &&
          aA.mUserContextId == aB.mUserContextId &&
          aA.mPrivateBrowsingId == aB.mPrivateBrowsingId;
 }
 
 /* static */ bool
--- a/dom/base/ChromeUtils.h
+++ b/dom/base/ChromeUtils.h
@@ -84,20 +84,16 @@ public:
                                  dom::OriginAttributesDictionary& aNewAttrs);
 
   static bool
   IsOriginAttributesEqual(dom::GlobalObject& aGlobal,
                           const dom::OriginAttributesDictionary& aA,
                           const dom::OriginAttributesDictionary& aB);
 
   static bool
-  IsOriginAttributesEqual(const dom::OriginAttributesDictionary& aA,
-                          const dom::OriginAttributesDictionary& aB);
-
-  static bool
   IsOriginAttributesEqualIgnoringAddonId(const dom::OriginAttributesDictionary& aA,
                                          const dom::OriginAttributesDictionary& aB);
 };
 
 } // namespace dom
 } // namespace mozilla
 
 #endif // mozilla_dom_ChromeUtils__
--- a/dom/base/test/chrome/window_swapFrameLoaders.xul
+++ b/dom/base/test/chrome/window_swapFrameLoaders.xul
@@ -90,18 +90,17 @@ Test swapFrameLoaders with different fra
     let mm = frame.frameLoader.messageManager;
     yield once(mm, "test:load");
     return frame;
   }
 
   add_task(function*() {
     yield new Promise(resolve => {
       SpecialPowers.pushPrefEnv(
-        { "set": [["dom.mozBrowserFramesEnabled", true],
-                  ["network.disable.ipc.security", true]] },
+        { "set": [["dom.mozBrowserFramesEnabled", true]] },
         resolve);
     });
   });
 
   add_task(function*() {
     for (let scenario of SCENARIOS) {
       let [ typeA, typeB, remote ] = scenario;
       remote = !!remote;
--- a/dom/base/test/test_bug1022229.html
+++ b/dom/base/test/test_bug1022229.html
@@ -19,17 +19,16 @@ https://bugzilla.mozilla.org/show_bug.cg
   SimpleTest.waitForExplicitFinish();
   function go() {
     var ifr = document.createElement('iframe');
 
     /* Uncomment this chunk to run in a mozBrowser. Make sure to uncomment the
        chunk in iframe_main as well. */
     /*
     SpecialPowers.Services.prefs.setBoolPref("dom.mozBrowserFramesEnabled", true);
-    SpecialPowers.Services.prefs.setBoolPref("network.disable.ipc.security", true);
     SpecialPowers.Services.prefs.setBoolPref("dom.ipc.browser_frames.oop_by_default", false);
     SpecialPowers.addPermission("browser", true, document);
     SpecialPowers.wrap(ifr).mozbrowser = true;
     */
 
     ifr.setAttribute('src', 'iframe_main_bug1022229.html');
     document.body.appendChild(ifr);
   }
--- a/dom/base/test/test_ipc_messagemanager_blob.html
+++ b/dom/base/test/test_ipc_messagemanager_blob.html
@@ -128,16 +128,15 @@
     addEventListener("load", function() {
       info("Got load event.");
 
       SpecialPowers.addPermission("browser", true, document);
       SpecialPowers.pushPrefEnv({
         "set": [
           ["dom.ipc.browser_frames.oop_by_default", true],
           ["dom.mozBrowserFramesEnabled", true],
-          ["network.disable.ipc.security", true],
           ["browser.pagethumbnails.capturing_disabled", true]
         ]
       }, runTests);
     });
   </script>
 </body>
 </html>
--- a/dom/base/test/test_messagemanager_principal.html
+++ b/dom/base/test/test_messagemanager_principal.html
@@ -80,16 +80,15 @@
       info("Got load event.");
 
       permManager.addFromPrincipal(window.document.nodePrincipal, "browser",
                                    Ci.nsIPermissionManager.ALLOW_ACTION);
 
       SpecialPowers.pushPrefEnv({
         "set": [
           ["dom.mozBrowserFramesEnabled", true],
-          ["network.disable.ipc.security", true],
           ["browser.pagethumbnails.capturing_disabled", true]
         ]
       }, runTests);
     });
   </script>
 </body>
 </html>
--- a/dom/base/test/test_messagemanager_send_principal.html
+++ b/dom/base/test/test_messagemanager_send_principal.html
@@ -116,16 +116,15 @@
       info("Got load event.");
 
       permManager.addFromPrincipal(window.document.nodePrincipal, "browser",
                                    Ci.nsIPermissionManager.ALLOW_ACTION);
 
       SpecialPowers.pushPrefEnv({
         "set": [
           ["dom.mozBrowserFramesEnabled", true],
-          ["network.disable.ipc.security", true],
           ["browser.pagethumbnails.capturing_disabled", true]
         ]
       }, runTests);
     });
   </script>
 </body>
 </html>
--- a/dom/base/test/test_messagemanager_targetchain.html
+++ b/dom/base/test/test_messagemanager_targetchain.html
@@ -110,17 +110,16 @@
         { type: "browser", allow: 1, context: { url: principal.URI.spec,
                                                 originAttributes: {
                                                   appId: principal.appId,
                                                   inIsolatedMozBrowser: true }}}
       ], () => {
         SpecialPowers.pushPrefEnv({
           set: [
             ["dom.mozBrowserFramesEnabled", true],
-            ["network.disable.ipc.security", true],
             ["dom.ipc.browser_frames.oop_by_default", false],
           ]
         }, runTests);
       });
     });
   </script>
 </body>
 </html>
--- a/dom/base/test/test_mozbrowser_apis_allowed.html
+++ b/dom/base/test/test_mozbrowser_apis_allowed.html
@@ -8,18 +8,17 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
 </head>
 
 <body>
 <script type="application/javascript;version=1.8">
   add_task(function*() {
     yield new Promise(resolve => {
       SpecialPowers.pushPrefEnv(
-        { "set": [["dom.mozBrowserFramesEnabled", true],
-                  ["network.disable.ipc.security", true]] },
+        { "set": [["dom.mozBrowserFramesEnabled", true]] },
         resolve);
     });
   });
 
   add_task(function*() {
     // Create <iframe mozbrowser>
     let frame = yield loadFrame({
       mozbrowser: "true",
--- a/dom/base/test/test_mozbrowser_apis_blocked.html
+++ b/dom/base/test/test_mozbrowser_apis_blocked.html
@@ -8,18 +8,17 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 
 <body>
 <script type="application/javascript;version=1.8">
   add_task(function*() {
     yield new Promise(resolve => {
       SpecialPowers.pushPrefEnv(
-        { "set": [["dom.mozBrowserFramesEnabled", true],
-                  ["network.disable.ipc.security", true]] },
+        { "set": [["dom.mozBrowserFramesEnabled", true]] },
         resolve);
     });
   });
 
   add_task(function*() {
     // Create <iframe mozbrowser>
     let frame = yield loadFrame({
       mozbrowser: "true"
--- a/dom/base/test/test_postMessage_originAttributes.html
+++ b/dom/base/test/test_postMessage_originAttributes.html
@@ -5,22 +5,16 @@
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 
 <body>
 <iframe id="target-iframe"></iframe>
 <script type="application/javascript">
-
-add_task(function*() {
-  yield SpecialPowers.pushPrefEnv(
-    { "set": [["network.disable.ipc.security", true]] });
-});
-
 add_task(function*() {
   let iframe = document.querySelector("#target-iframe");
 
   let win = SpecialPowers.wrap(iframe).contentWindow;
   let docShell = win.QueryInterface(SpecialPowers.Ci.nsIInterfaceRequestor)
                     .getInterface(SpecialPowers.Ci.nsIDocShell);
 
   // Add private browsing ID to docShell origin and load document.
--- a/dom/browser-element/mochitest/browserElementTestHelpers.js
+++ b/dom/browser-element/mochitest/browserElementTestHelpers.js
@@ -57,18 +57,17 @@ const browserElementTestHelpers = {
     );
   },
 
   setClipboardPlainTextOnlyPref: function(value) {
     this._setPref('clipboard.plainTextOnly', value);
   },
 
   setEnabledPref: function(value) {
-    this._setPrefs(['dom.mozBrowserFramesEnabled', value],
-                   ['network.disable.ipc.security', value]);
+    this._setPref('dom.mozBrowserFramesEnabled', value);
   },
 
   setupAccessibleCaretPref: function() {
     this._setPref('layout.accessiblecaret.enabled', true);
     // Disable hide carets for mouse input for select-all tests so that we can
     // get mozbrowsercaretstatechanged events.
     this._setPref('layout.accessiblecaret.hide_carets_for_mouse_input', false);
   },
--- a/dom/crypto/test/test_indexedDB.html
+++ b/dom/crypto/test/test_indexedDB.html
@@ -47,15 +47,14 @@
         });
       });
     }
 
     addEventListener("load", function () {
       SpecialPowers.addPermission("browser", true, document);
       SpecialPowers.pushPrefEnv({set: [
         ["dom.ipc.browser_frames.oop_by_default", true],
-        ["dom.mozBrowserFramesEnabled", true],
-        ["network.disable.ipc.security", true]
+        ["dom.mozBrowserFramesEnabled", true]
       ]}, runTest);
     });
   </script>
 </body>
 </html>
--- a/dom/devicestorage/test/test_app_permissions.html
+++ b/dom/devicestorage/test/test_app_permissions.html
@@ -639,17 +639,16 @@ try {
   } catch(e) {}
 }
 
 createTestFile('.txt');
 var gTestRunner = runTest();
 SpecialPowers.addPermission("browser", true, gTestUri);
 
 SpecialPowers.pushPrefEnv({'set': [["dom.mozBrowserFramesEnabled", true],
-                                   ["network.disable.ipc.security", true],
                                    ["device.storage.enabled", true],
                                    ["device.storage.testing", true],
                                    ["device.storage.prompt.testing", false]]},
   function() {  gTestRunner.next(); });
 
 </script>
 </pre>
 </body>
--- a/dom/devicestorage/test/test_fs_app_permissions.html
+++ b/dom/devicestorage/test/test_fs_app_permissions.html
@@ -814,17 +814,16 @@ function createTestFile(extension) {
     f.create(Ci.nsIFile.NORMAL_FILE_TYPE, 0666);
   } catch(e) {}
 }
 
 let gTestRunner = runTest();
 SpecialPowers.addPermission("browser", true, gTestUri);
 
 SpecialPowers.pushPrefEnv({'set': [["dom.mozBrowserFramesEnabled", true],
-                                   ["network.disable.ipc.security", true],
                                    ["device.storage.enabled", true],
                                    ["device.storage.testing", true],
                                    ["device.storage.prompt.testing", false]]},
   function() { gTestRunner.next(); });
 
 </script>
 </pre>
 </body>
--- a/dom/events/test/test_bug1096146.html
+++ b/dom/events/test/test_bug1096146.html
@@ -147,19 +147,17 @@ var tests = [
       [{ type: "before-after-keyboard-event", allow: true, context: document },
        { type: "browser", allow: true, context: document }],
       runTests);
   },
   function addPreferences() {
     SpecialPowers.pushPrefEnv(
       { "set": [["dom.beforeAfterKeyboardEvent.enabled", true],
                 ["dom.mozBrowserFramesEnabled", true],
-                ["network.disable.ipc.security", true],
-                ["dom.ipc.tabs.disabled", false],
-                ["network.disable.ipc.security", true]] },
+                ["dom.ipc.tabs.disabled", false]] },
       runTests);
   },
 
   prepareTest,
   testDefaultAction,
   teardownHandler,
 
   function() {
--- a/dom/events/test/test_dom_before_after_keyboard_event.html
+++ b/dom/events/test/test_dom_before_after_keyboard_event.html
@@ -102,17 +102,16 @@ var tests = [
       [{ type: "before-after-keyboard-event", allow: true, context: document },
        { type: "browser", allow: true, context: document }],
       runTests);
   },
   function addPreferences() {
     SpecialPowers.pushPrefEnv(
       { "set": [["dom.beforeAfterKeyboardEvent.enabled", true],
                 ["dom.mozBrowserFramesEnabled", true],
-                ["network.disable.ipc.security", true],
                 ["dom.ipc.tabs.disabled", false]] },
       runTests);
   },
 
   // Tests for in-process iframe, i.e. <iframe mozbrowser>.
   function () {
     prepareTest(false);
   },
--- a/dom/events/test/test_dom_before_after_keyboard_event_remote.html
+++ b/dom/events/test/test_dom_before_after_keyboard_event_remote.html
@@ -161,17 +161,16 @@ var tests = [
       [{ type: "before-after-keyboard-event", allow: true, context: document },
        { type: "browser", allow: true, context: document }],
       runTests);
   },
   function addPreferences() {
     SpecialPowers.pushPrefEnv(
       { "set": [["dom.beforeAfterKeyboardEvent.enabled", true],
                 ["dom.mozBrowserFramesEnabled", true],
-                ["network.disable.ipc.security", true],
                 ["dom.ipc.tabs.disabled", false]] },
       runTests);
   },
 
   // Tests for out-of-process iframe, i.el. <iframe mozbrowser remote>
   function () {
     prepareTest(true);
   },
--- a/dom/html/test/test_ignoreuserfocus.html
+++ b/dom/html/test/test_ignoreuserfocus.html
@@ -140,18 +140,17 @@
         iframe.setAttribute("src", "file_ignoreuserfocus.html");
       }
       addEventListener("load", function() {
         SpecialPowers.pushPermissions(
           [{'type': 'browser', 'allow': true, 'context': document}],
           function() {
             SpecialPowers.pushPrefEnv({
               "set": [
-                ["dom.mozBrowserFramesEnabled", true],
-                ["network.disable.ipc.security", true],
+                ["dom.mozBrowserFramesEnabled", true]
               ]
             }, function() {
               SimpleTest.waitForFocus(runTest);
             });
           });
       });
     </script>
   </body>
--- a/dom/indexedDB/test/test_message_manager_ipc.html
+++ b/dom/indexedDB/test/test_message_manager_ipc.html
@@ -302,17 +302,16 @@ function parentFrameScript(mm) {
 }
 
 function setup() {
   info("Got load event");
 
   SpecialPowers.pushPrefEnv(
     { set: [ ["dom.ipc.browser_frames.oop_by_default", true],
               ["dom.mozBrowserFramesEnabled", true],
-              ["network.disable.ipc.security", true],
               ["browser.pagethumbnails.capturing_disabled", true] ] },
     function() {
       info("Prefs set");
 
       SpecialPowers.pushPermissions(
         [ { type: "browser", allow: true, context: document } ],
         function() {
           info("Permissions set");
--- a/dom/inputmethod/mochitest/inputmethod_common.js
+++ b/dom/inputmethod/mochitest/inputmethod_common.js
@@ -4,17 +4,16 @@ function inputmethod_setup(callback) {
   let appInfo = SpecialPowers.Cc['@mozilla.org/xre/app-info;1']
                 .getService(SpecialPowers.Ci.nsIXULAppInfo);
   if (appInfo.name != 'B2G') {
     SpecialPowers.Cu.import("resource://gre/modules/Keyboard.jsm", this);
   }
 
   let prefs = [
     ['dom.mozBrowserFramesEnabled', true],
-    ['network.disable.ipc.security', true],
     // Enable navigator.mozInputMethod.
     ['dom.mozInputMethod.enabled', true]
   ];
   SpecialPowers.pushPrefEnv({set: prefs}, function() {
     SimpleTest.waitForFocus(callback);
   });
 }
 
--- a/dom/ipc/tests/test_CrashService_crash.html
+++ b/dom/ipc/tests/test_CrashService_crash.html
@@ -13,17 +13,16 @@ Ensures that content crashes are reporte
 <script type="application/javascript;version=1.7">
 "use strict";
 
 SimpleTest.waitForExplicitFinish();
 SimpleTest.requestFlakyTimeout("untriaged");
 SpecialPowers.addPermission("browser", true, document);
 SpecialPowers.pushPrefEnv({'set':[
   ["dom.mozBrowserFramesEnabled", true],
-  ["network.disable.ipc.security", true],
   ["dom.ipc.tabs.disabled", false]
 ]}, function () {
 
   var iframe =  document.createElementNS('http://www.w3.org/1999/xhtml', 'iframe');
   iframe.setAttribute("remote", "true");
   SpecialPowers.wrap(iframe).mozbrowser = true;
   document.documentElement.appendChild(iframe);
 
--- a/dom/ipc/tests/test_blob_sliced_from_child_process.html
+++ b/dom/ipc/tests/test_blob_sliced_from_child_process.html
@@ -144,17 +144,16 @@ function parentFrameScript(mm) {
 }
 
 function setup() {
   info("Got load event");
 
   SpecialPowers.pushPrefEnv(
     { set: [ ["dom.ipc.browser_frames.oop_by_default", true],
               ["dom.mozBrowserFramesEnabled", true],
-              ["network.disable.ipc.security", true],
               ["browser.pagethumbnails.capturing_disabled", true] ] },
     function() {
       info("Prefs set");
 
       SpecialPowers.pushPermissions(
         [ { type: "browser", allow: true, context: document } ],
         function() {
           info("Permissions set");
--- a/dom/ipc/tests/test_blob_sliced_from_parent_process.html
+++ b/dom/ipc/tests/test_blob_sliced_from_parent_process.html
@@ -172,17 +172,16 @@ function parentFrameScript(mm) {
 }
 
 function setup() {
   info("Got load event");
 
   SpecialPowers.pushPrefEnv(
     { set: [ ["dom.ipc.browser_frames.oop_by_default", true],
              ["dom.mozBrowserFramesEnabled", true],
-             ["network.disable.ipc.security", true],
              ["browser.pagethumbnails.capturing_disabled", true] ] },
     function() {
       info("Prefs set");
 
       SpecialPowers.pushPermissions(
         [ { type: "browser", allow: true, context: document } ],
         function() {
           info("Permissions set");
--- a/dom/ipc/tests/test_bug1086684.html
+++ b/dom/ipc/tests/test_bug1086684.html
@@ -92,16 +92,15 @@
     addEventListener("load", function() {
       info("Got load event.");
 
       SpecialPowers.addPermission("browser", true, document);
       SpecialPowers.pushPrefEnv({
         "set": [
           ["dom.ipc.browser_frames.oop_by_default", true],
           ["dom.mozBrowserFramesEnabled", true],
-          ["network.disable.ipc.security", true],
           ["browser.pagethumbnails.capturing_disabled", true]
         ]
       }, runTests);
     });
   </script>
 </body>
 </html>
--- a/dom/ipc/tests/test_child_docshell.html
+++ b/dom/ipc/tests/test_child_docshell.html
@@ -10,17 +10,16 @@
 
 <script type="application/javascript;version=1.7">
 "use strict";
 
 SimpleTest.waitForExplicitFinish();
 SpecialPowers.addPermission("browser", true, document);
 SpecialPowers.pushPrefEnv({'set':[
   ["dom.mozBrowserFramesEnabled", true],
-  ["network.disable.ipc.security", true],
   ["dom.ipc.tabs.disabled", false]
 ]}, function () {
 
   var iframe =  document.createElementNS('http://www.w3.org/1999/xhtml', 'iframe');
   iframe.setAttribute("remote", "true");
   SpecialPowers.wrap(iframe).mozbrowser = true;
   document.documentElement.appendChild(iframe);
 
--- a/dom/ipc/tests/test_cpow_cookies.html
+++ b/dom/ipc/tests/test_cpow_cookies.html
@@ -75,16 +75,15 @@
     addEventListener("load", function() {
       info("Got load event.");
 
       SpecialPowers.addPermission("browser", true, document);
       SpecialPowers.pushPrefEnv({
         "set": [
           ["dom.ipc.browser_frames.oop_by_default", true],
           ["dom.mozBrowserFramesEnabled", true],
-          ["network.disable.ipc.security", true],
           ["browser.pagethumbnails.capturing_disabled", true]
         ]
       }, runTests);
     });
   </script>
 </body>
 </html>
--- a/dom/permission/tests/test_browser.html
+++ b/dom/permission/tests/test_browser.html
@@ -32,18 +32,17 @@ function verifier(success, failure) {
 
   document.getElementById('content').appendChild(iframe);
 }
 
 var gData = [
   {
     perm: ["browser"],
     needParentPerm: true,
-    settings: [["dom.mozBrowserFramesEnabled", true],
-               ["network.disable.ipc.security", true]],
+    settings: [["dom.mozBrowserFramesEnabled", true]],
     verifier: verifier.toSource(),
   }
 ]
 </script>
 </pre>
 </body>
 </html>
 
--- a/dom/permission/tests/test_embed-apps.html
+++ b/dom/permission/tests/test_embed-apps.html
@@ -45,18 +45,17 @@ var gData = [
     perm: ["embed-apps", "browser"],
     /*
      * Android doesn't have working apps
      * Mobile is for B2G which has a weird testing setup
      * the app iframe gets embed in the test-container iframe
      * which returns APP_STATUS_NOT_INSTALLED
      */
     skip: ["Android", "Mobile"],
-    settings: [["dom.mozBrowserFramesEnabled", true],
-               ["network.disable.ipc.security", true]],
+    settings: [["dom.mozBrowserFramesEnabled", true]],
     verifier: verifier.toSource(),
   }
 ]
 </script>
 </pre>
 </body>
 </html>
 
--- a/dom/permission/tests/test_input-manage.html
+++ b/dom/permission/tests/test_input-manage.html
@@ -52,18 +52,17 @@ function verifier(success, failure) {
 
 var gData = [
   {
     perm: ["input-manage", "browser"],
     needParentPerm: true,
     obj: "mozInputMethod",
     webidl: "MozInputMethod",
     settings: [["dom.mozInputMethod.enabled", true],
-               ["dom.mozBrowserFramesEnabled", true],
-               ["network.disable.ipc.security", true]],
+               ["dom.mozBrowserFramesEnabled", true]],
     verifier: verifier.toSource()
   }
 ]
 </script>
 </pre>
 </body>
 </html>
 
--- a/dom/presentation/tests/mochitest/test_presentation_1ua_connection_wentaway.js
+++ b/dom/presentation/tests/mochitest/test_presentation_1ua_connection_wentaway.js
@@ -164,12 +164,11 @@ SpecialPowers.pushPermissions([
   {type: "browser", allow: true, context: document},
 ], () => {
   SpecialPowers.pushPrefEnv({ 'set': [["dom.presentation.enabled", true],
                                       ["dom.presentation.controller.enabled", true],
                                       ["dom.presentation.receiver.enabled", true],
                                       ["dom.presentation.test.enabled", true],
                                       ["dom.mozBrowserFramesEnabled", true],
                                       ["dom.ipc.tabs.disabled", false],
-                                      ["network.disable.ipc.security", true],
                                       ["dom.presentation.test.stage", 0]]},
                             runTests);
 });
--- a/dom/presentation/tests/mochitest/test_presentation_1ua_sender_and_receiver.js
+++ b/dom/presentation/tests/mochitest/test_presentation_1ua_sender_and_receiver.js
@@ -359,12 +359,11 @@ SpecialPowers.pushPermissions([
   SpecialPowers.pushPrefEnv({ 'set': [["dom.presentation.enabled", true],
                                       /* Mocked TCP session transport builder in the test */
                                       ["dom.presentation.session_transport.data_channel.enable", true],
                                       ["dom.presentation.controller.enabled", true],
                                       ["dom.presentation.receiver.enabled", true],
                                       ["dom.presentation.test.enabled", true],
                                       ["dom.presentation.test.stage", 0],
                                       ["dom.mozBrowserFramesEnabled", true],
-                                      ["network.disable.ipc.security", true],
                                       ["media.navigator.permission.disabled", true]]},
                             runTests);
 });
--- a/dom/presentation/tests/mochitest/test_presentation_dc_receiver.html
+++ b/dom/presentation/tests/mochitest/test_presentation_dc_receiver.html
@@ -126,16 +126,15 @@ SimpleTest.waitForExplicitFinish();
 SpecialPowers.pushPermissions([
   {type: 'presentation-device-manage', allow: false, context: document},
   {type: "browser", allow: true, context: document},
 ], function() {
   SpecialPowers.pushPrefEnv({ 'set': [["dom.presentation.enabled", true],
                                       ["dom.presentation.controller.enabled", false],
                                       ["dom.presentation.receiver.enabled", true],
                                       ["dom.presentation.session_transport.data_channel.enable", true],
-                                      ["dom.mozBrowserFramesEnabled", true],
-                                      ["network.disable.ipc.security", true]]},
+                                      ["dom.mozBrowserFramesEnabled", true]]},
                             runTests);
 });
 
 </script>
 </body>
 </html>
--- a/dom/presentation/tests/mochitest/test_presentation_dc_receiver_oop.html
+++ b/dom/presentation/tests/mochitest/test_presentation_dc_receiver_oop.html
@@ -197,17 +197,16 @@ SpecialPowers.pushPermissions([
   {type: 'presentation-device-manage', allow: false, context: document},
   {type: 'browser', allow: true, context: document},
 ], function() {
   SpecialPowers.pushPrefEnv({ 'set': [["dom.presentation.enabled", true],
                                       ["dom.presentation.controller.enabled", false],
                                       ["dom.presentation.receiver.enabled", true],
                                       ["dom.presentation.session_transport.data_channel.enable", true],
                                       ["dom.mozBrowserFramesEnabled", true],
-                                      ["network.disable.ipc.security", true],
                                       ["dom.ipc.browser_frames.oop_by_default", true],
                                       ["presentation.receiver.loading.timeout", 5000000]]},
                             runTests);
 });
 
 </script>
 </body>
 </html>
--- a/dom/presentation/tests/mochitest/test_presentation_receiver_auxiliary_navigation.js
+++ b/dom/presentation/tests/mochitest/test_presentation_receiver_auxiliary_navigation.js
@@ -66,12 +66,11 @@ SimpleTest.waitForExplicitFinish();
 SpecialPowers.pushPermissions([
   {type: "presentation-device-manage", allow: false, context: document},
   {type: "browser", allow: true, context: document},
 ], function() {
   SpecialPowers.pushPrefEnv({ "set": [["dom.presentation.enabled", true],
                                       ["dom.presentation.controller.enabled", true],
                                       ["dom.presentation.receiver.enabled", true],
                                       ["dom.mozBrowserFramesEnabled", true],
-                                      ["network.disable.ipc.security", true],
                                       ["dom.presentation.session_transport.data_channel.enable", false]]},
                             runTests);
 });
--- a/dom/presentation/tests/mochitest/test_presentation_tcp_receiver.html
+++ b/dom/presentation/tests/mochitest/test_presentation_tcp_receiver.html
@@ -122,16 +122,15 @@ SimpleTest.waitForExplicitFinish();
 SpecialPowers.pushPermissions([
   {type: 'presentation-device-manage', allow: false, context: document},
   {type: 'browser', allow: true, context: document},
 ], function() {
   SpecialPowers.pushPrefEnv({ 'set': [["dom.presentation.enabled", true],
                                       ["dom.presentation.controller.enabled", false],
                                       ["dom.presentation.receiver.enabled", true],
                                       ["dom.mozBrowserFramesEnabled", true],
-                                      ["network.disable.ipc.security", true],
                                       ["dom.presentation.session_transport.data_channel.enable", false]]},
                             runTests);
 });
 
 </script>
 </body>
 </html>
--- a/dom/presentation/tests/mochitest/test_presentation_tcp_receiver_establish_connection_error.html
+++ b/dom/presentation/tests/mochitest/test_presentation_tcp_receiver_establish_connection_error.html
@@ -95,16 +95,15 @@ function runTests() {
 SimpleTest.waitForExplicitFinish();
 SpecialPowers.pushPermissions([
   {type: 'presentation-device-manage', allow: false, context: document},
   {type: "browser", allow: true, context: document},
 ], function() {
   SpecialPowers.pushPrefEnv({ 'set': [["dom.presentation.enabled", true],
                                       ["dom.presentation.receiver.enabled", true],
                                       ["dom.presentation.session_transport.data_channel.enable", false],
-                                      ["dom.mozBrowserFramesEnabled", true],
-                                      ["network.disable.ipc.security", true]]},
+                                      ["dom.mozBrowserFramesEnabled", true]]},
                             runTests);
 });
 
 </script>
 </body>
 </html>
--- a/dom/presentation/tests/mochitest/test_presentation_tcp_receiver_establish_connection_unknown_content_type.js
+++ b/dom/presentation/tests/mochitest/test_presentation_tcp_receiver_establish_connection_unknown_content_type.js
@@ -77,12 +77,11 @@ SpecialPowers.pushPermissions([
   {type: 'presentation-device-manage', allow: false, context: document},
   {type: 'browser', allow: true, context: document},
 ], function() {
   SpecialPowers.pushPrefEnv({ 'set': [['dom.presentation.enabled', true],
                                       ["dom.presentation.controller.enabled", true],
                                       ["dom.presentation.receiver.enabled", true],
                                       ['dom.presentation.session_transport.data_channel.enable', false],
                                       ['dom.mozBrowserFramesEnabled', true],
-                                      ["network.disable.ipc.security", true],
                                       ['dom.ipc.tabs.disabled', false]]},
                             runTests);
 });
--- a/dom/presentation/tests/mochitest/test_presentation_tcp_receiver_oop.html
+++ b/dom/presentation/tests/mochitest/test_presentation_tcp_receiver_oop.html
@@ -163,16 +163,15 @@ SpecialPowers.pushPermissions([
   {type: 'presentation-device-manage', allow: false, context: document},
   {type: 'browser', allow: true, context: document},
 ], function() {
   SpecialPowers.pushPrefEnv({ 'set': [["dom.presentation.enabled", true],
                                       ["dom.presentation.controller.enabled", false],
                                       ["dom.presentation.receiver.enabled", true],
                                       ["dom.presentation.session_transport.data_channel.enable", false],
                                       ["dom.mozBrowserFramesEnabled", true],
-                                      ["network.disable.ipc.security", true],
                                       ["dom.ipc.browser_frames.oop_by_default", true]]},
                             runTests);
 });
 
 </script>
 </body>
 </html>
--- a/dom/presentation/tests/mochitest/test_presentation_terminate.js
+++ b/dom/presentation/tests/mochitest/test_presentation_terminate.js
@@ -231,13 +231,12 @@ SpecialPowers.pushPermissions([
   {type: 'presentation-device-manage', allow: false, context: document},
   {type: 'browser', allow: true, context: document},
 ], () => {
   SpecialPowers.pushPrefEnv({ 'set': [['dom.presentation.enabled', true],
                                       ["dom.presentation.controller.enabled", true],
                                       ["dom.presentation.receiver.enabled", true],
                                       ['dom.presentation.test.enabled', true],
                                       ['dom.mozBrowserFramesEnabled', true],
-                                      ["network.disable.ipc.security", true],
                                       ['dom.ipc.tabs.disabled', false],
                                       ['dom.presentation.test.stage', 0]]},
                             runTests);
 });
--- a/dom/presentation/tests/mochitest/test_presentation_terminate_establish_connection_error.js
+++ b/dom/presentation/tests/mochitest/test_presentation_terminate_establish_connection_error.js
@@ -185,13 +185,12 @@ SpecialPowers.pushPermissions([
   {type: 'presentation-device-manage', allow: false, context: document},
   {type: 'browser', allow: true, context: document},
 ], () => {
   SpecialPowers.pushPrefEnv({ 'set': [['dom.presentation.enabled', true],
                                       ["dom.presentation.controller.enabled", true],
                                       ["dom.presentation.receiver.enabled", true],
                                       ['dom.presentation.test.enabled', true],
                                       ['dom.mozBrowserFramesEnabled', true],
-                                      ["network.disable.ipc.security", true],
                                       ['dom.ipc.tabs.disabled', false],
                                       ['dom.presentation.test.stage', 0]]},
                             runTests);
 });
--- a/dom/tests/browser/browser_frame_elements.js
+++ b/dom/tests/browser/browser_frame_elements.js
@@ -64,26 +64,24 @@ function startTests() {
   Assert.equal(objectDataUrl.contentWindow.top, gWindow, "gWindow is top");
   Assert.equal(objectDataUrl.contentWindow.parent, gWindow, "gWindow is parent");
 }
 
 function* mozBrowserTests(browser) {
   info("Granting special powers for mozbrowser");
   SpecialPowers.addPermission("browser", true, TEST_URI);
   SpecialPowers.setBoolPref('dom.mozBrowserFramesEnabled', true);
-  SpecialPowers.setBoolPref('network.disable.ipc.security', true);
 
   yield ContentTask.spawn(browser, null, function() {
     info("Checking mozbrowser iframe");
     let mozBrowserFrame = content.document.createElement("iframe");
     mozBrowserFrame.setAttribute("mozbrowser", "");
     content.document.body.appendChild(mozBrowserFrame);
     Assert.equal(mozBrowserFrame.contentWindow.top, mozBrowserFrame.contentWindow,
         "Mozbrowser top == iframe window");
     Assert.equal(mozBrowserFrame.contentWindow.parent, mozBrowserFrame.contentWindow,
         "Mozbrowser parent == iframe window");
   });
 
   info("Revoking special powers for mozbrowser");
-  SpecialPowers.clearUserPref('dom.mozBrowserFramesEnabled');
-  SpecialPowers.clearUserPref('network.disable.ipc.security');
+  SpecialPowers.clearUserPref('dom.mozBrowserFramesEnabled')
   SpecialPowers.removePermission("browser", TEST_URI);
 }
--- a/netwerk/ipc/NeckoParent.cpp
+++ b/netwerk/ipc/NeckoParent.cpp
@@ -19,17 +19,16 @@
 #include "mozilla/Unused.h"
 #ifdef NECKO_PROTOCOL_rtsp
 #include "mozilla/net/RtspControllerParent.h"
 #include "mozilla/net/RtspChannelParent.h"
 #endif
 #include "mozilla/net/DNSRequestParent.h"
 #include "mozilla/net/ChannelDiverterParent.h"
 #include "mozilla/net/IPCTransportProvider.h"
-#include "mozilla/dom/ChromeUtils.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/TabContext.h"
 #include "mozilla/dom/TabParent.h"
 #include "mozilla/dom/network/TCPSocketParent.h"
 #include "mozilla/dom/network/TCPServerSocketParent.h"
 #include "mozilla/dom/network/UDPSocketParent.h"
 #include "mozilla/dom/workers/ServiceWorkerManager.h"
 #include "mozilla/LoadContext.h"
@@ -43,17 +42,16 @@
 #include "nsIAuthPromptCallback.h"
 #include "nsPrincipal.h"
 #include "nsINetworkPredictor.h"
 #include "nsINetworkPredictorVerifier.h"
 #include "nsISpeculativeConnect.h"
 
 using mozilla::DocShellOriginAttributes;
 using mozilla::NeckoOriginAttributes;
-using mozilla::dom::ChromeUtils;
 using mozilla::dom::ContentParent;
 using mozilla::dom::TabContext;
 using mozilla::dom::TabParent;
 using mozilla::net::PTCPSocketParent;
 using mozilla::dom::TCPSocketParent;
 using mozilla::net::PTCPServerSocketParent;
 using mozilla::dom::TCPServerSocketParent;
 using mozilla::net::PUDPSocketParent;
@@ -138,71 +136,81 @@ GetRequestingPrincipal(const FTPChannelC
   if (aArgs.type() != FTPChannelCreationArgs::TFTPChannelOpenArgs) {
     return nullptr;
   }
 
   const FTPChannelOpenArgs& args = aArgs.get_FTPChannelOpenArgs();
   return GetRequestingPrincipal(args.loadInfo());
 }
 
-// Bug 1289001 - If GetValidatedOriginAttributes returns an error string, that
-// usually leads to a content crash with very little info about the cause.
+// Bug 1289001 - If GetValidatedAppInfo returns an error string, that usually
+// leads to a content crash with very little info about the cause.
 // We prefer to crash on the parent, so we get the reason in the crash report.
 static MOZ_COLD
 void CrashWithReason(const char * reason)
 {
 #ifndef RELEASE_OR_BETA
   MOZ_CRASH_ANNOTATE(reason);
   MOZ_REALLY_CRASH();
 #endif
 }
 
 const char*
-NeckoParent::GetValidatedOriginAttributes(const SerializedLoadContext& aSerialized,
-                                          PContentParent* aContent,
-                                          nsIPrincipal* aRequestingPrincipal,
-                                          DocShellOriginAttributes& aAttrs)
+NeckoParent::GetValidatedAppInfo(const SerializedLoadContext& aSerialized,
+                                 PContentParent* aContent,
+                                 nsIPrincipal* aRequestingPrincipal,
+                                 DocShellOriginAttributes& aAttrs)
 {
   if (!aSerialized.IsNotNull()) {
     if (UsingNeckoIPCSecurity()) {
-      CrashWithReason("GetValidatedOriginAttributes | SerializedLoadContext from child is null");
+      CrashWithReason("GetValidatedAppInfo | SerializedLoadContext from child is null");
       return "SerializedLoadContext from child is null";
     }
 
     // If serialized is null, we cannot validate anything. We have to assume
     // that this requests comes from a SystemPrincipal.
     aAttrs = DocShellOriginAttributes(NECKO_NO_APP_ID, false);
     return nullptr;
   }
 
   nsTArray<TabContext> contextArray =
     static_cast<ContentParent*>(aContent)->GetManagedTabContext();
 
-  nsAutoCString serializedSuffix;
-  aSerialized.mOriginAttributes.CreateAnonymizedSuffix(serializedSuffix);
-
   nsAutoCString debugString;
   for (uint32_t i = 0; i < contextArray.Length(); i++) {
-    const TabContext& tabContext = contextArray[i];
+    TabContext tabContext = contextArray[i];
+    uint32_t appId = tabContext.OwnOrContainingAppId();
+    bool inBrowserElement = aSerialized.mOriginAttributes.mInIsolatedMozBrowser;
 
-    if (!ChromeUtils::IsOriginAttributesEqual(aSerialized.mOriginAttributes,
-                                              tabContext.OriginAttributesRef())) {
+    if (appId == NECKO_UNKNOWN_APP_ID) {
+      debugString.Append("u,");
+      continue;
+    }
+    // We may get appID=NO_APP if child frame is neither a browser nor an app
+    if (appId == NECKO_NO_APP_ID && tabContext.HasOwnApp()) {
+      // NECKO_NO_APP_ID but also is an app?  Weird, skip.
+      debugString.Append("h,");
+      continue;
+    }
+
+    if (aSerialized.mOriginAttributes.mUserContextId != tabContext.OriginAttributesRef().mUserContextId) {
       debugString.Append("(");
-      debugString.Append(serializedSuffix);
+      debugString.AppendInt(aSerialized.mOriginAttributes.mUserContextId);
       debugString.Append(",");
-
-      nsAutoCString tabSuffix;
-      tabContext.OriginAttributesRef().CreateAnonymizedSuffix(tabSuffix);
-      debugString.Append(tabSuffix);
-
+      debugString.AppendInt(tabContext.OriginAttributesRef().mUserContextId);
       debugString.Append(")");
       continue;
     }
+    aAttrs = DocShellOriginAttributes();
+    aAttrs.mAppId = appId;
+    aAttrs.mInIsolatedMozBrowser = inBrowserElement;
+    aAttrs.mUserContextId = aSerialized.mOriginAttributes.mUserContextId;
+    aAttrs.mPrivateBrowsingId = aSerialized.mOriginAttributes.mPrivateBrowsingId;
+    aAttrs.mFirstPartyDomain = aSerialized.mOriginAttributes.mFirstPartyDomain;
 
-    aAttrs = aSerialized.mOriginAttributes;
     return nullptr;
   }
 
   // This may be a ServiceWorker: when a push notification is received, FF wakes
   // up the corrisponding service worker so that it can manage the PushEvent. At
   // that time we probably don't have any valid tabcontext, but still, we want
   // to support http channel requests coming from that ServiceWorker.
   if (aRequestingPrincipal) {
@@ -213,24 +221,29 @@ NeckoParent::GetValidatedOriginAttribute
     if (swm &&
         swm->MayHaveActiveServiceWorkerInstance(static_cast<ContentParent*>(aContent),
                                                 aRequestingPrincipal)) {
       aAttrs = aSerialized.mOriginAttributes;
       return nullptr;
     }
   }
 
-  if (!UsingNeckoIPCSecurity()) {
-    // We are running some tests
+  if (contextArray.IsEmpty()) {
+    if (UsingNeckoIPCSecurity()) {
+      CrashWithReason("GetValidatedAppInfo | ContentParent does not have any PBrowsers");
+      return "ContentParent does not have any PBrowsers";
+    }
+
+    // We are running xpcshell tests
     aAttrs = aSerialized.mOriginAttributes;
     return nullptr;
   }
 
   nsAutoCString errorString;
-  errorString.Append("GetValidatedOriginAttributes | App does not have permission -");
+  errorString.Append("GetValidatedAppInfo | App does not have permission -");
   errorString.Append(debugString);
 
   // Leak the buffer on the heap to make sure that it lives long enough, as
   // MOZ_CRASH_ANNOTATE expects the pointer passed to it to live to the end of
   // the program.
   char * error = strdup(errorString.BeginReading());
   CrashWithReason(error);
   return "App does not have permission";
@@ -239,18 +252,18 @@ NeckoParent::GetValidatedOriginAttribute
 const char *
 NeckoParent::CreateChannelLoadContext(const PBrowserOrId& aBrowser,
                                       PContentParent* aContent,
                                       const SerializedLoadContext& aSerialized,
                                       nsIPrincipal* aRequestingPrincipal,
                                       nsCOMPtr<nsILoadContext> &aResult)
 {
   DocShellOriginAttributes attrs;
-  const char* error = GetValidatedOriginAttributes(aSerialized, aContent,
-                                                   aRequestingPrincipal, attrs);
+  const char* error = GetValidatedAppInfo(aSerialized, aContent,
+                                          aRequestingPrincipal, attrs);
   if (error) {
     return error;
   }
 
   // if !UsingNeckoIPCSecurity(), we may not have a LoadContext to set. This is
   // the common case for most xpcshell tests.
   if (aSerialized.IsNotNull()) {
     attrs.SyncAttributesWithPrivateBrowsing(aSerialized.mOriginAttributes.mPrivateBrowsingId > 0);
--- a/netwerk/ipc/NeckoParent.h
+++ b/netwerk/ipc/NeckoParent.h
@@ -30,20 +30,20 @@ class NeckoParent
   : public PNeckoParent
 {
 public:
   NeckoParent();
   virtual ~NeckoParent();
 
   MOZ_MUST_USE
   static const char *
-  GetValidatedOriginAttributes(const SerializedLoadContext& aSerialized,
-                               PContentParent* aBrowser,
-                               nsIPrincipal* aRequestingPrincipal,
-                               mozilla::DocShellOriginAttributes& aAttrs);
+  GetValidatedAppInfo(const SerializedLoadContext& aSerialized,
+                      PContentParent* aBrowser,
+                      nsIPrincipal* aRequestingPrincipal,
+                      mozilla::DocShellOriginAttributes& aAttrs);
 
   /*
    * Creates LoadContext for parent-side of an e10s channel.
    *
    * PContentParent corresponds to the process that is requesting the load.
    *
    * Returns null if successful, or an error string if failed.
    */