Backed out changeset 76788d4f83ce (bug 1277803)
authorIris Hsiao <ihsiao@mozilla.com>
Fri, 07 Oct 2016 11:23:40 +0800
changeset 316917 ae8e64903b30454bf610ac09ecbf91762198f6af
parent 316916 773ced366e56acb4d804961ef9759f048e2b4ffd
child 316918 1a2caa8f6ba6ab06517e574da50702d17901fbbd
push id30787
push userryanvm@gmail.com
push dateFri, 07 Oct 2016 13:42:34 +0000
treeherdermozilla-central@ea8624a9b11e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1277803
milestone52.0a1
backs out76788d4f83cef726fa5300ac6cda13481faf495e
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 76788d4f83ce (bug 1277803) CLOSED TREE
dom/security/test/general/bug1277803.html
dom/security/test/general/chrome.ini
dom/security/test/general/favicon_bug1277803.ico
dom/security/test/general/test_bug1277803.xul
dom/security/test/moz.build
deleted file mode 100644
--- a/dom/security/test/general/bug1277803.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-
-<head>
-  <link rel='icon' href='favicon_bug1277803.ico'>
-</head>
-
-<body>
-Nothing to see here...
-</body>
-
-</html>
deleted file mode 100644
--- a/dom/security/test/general/chrome.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[DEFAULT]
-support-files =
-    favicon_bug1277803.ico
-    bug1277803.html
-
-[test_bug1277803.xul]
deleted file mode 100644
index d44438903b751f4732f5365783eb0229b0501f9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/dom/security/test/general/test_bug1277803.xul
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
-
-<window title="Bug 1277803 test"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        width="600"
-        height="600"
-        onload="runTest();">
-
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-
-  <body xmlns="http://www.w3.org/1999/xhtml">
-  </body>
-
-  <script type="application/javascript"><![CDATA[
-    SimpleTest.requestCompleteLog();
-    let Ci = Components.interfaces;
-    let Cc = Components.classes;
-    let Cu = Components.utils;
-    let makeURI = Cu.import("resource://gre/modules/BrowserUtils.jsm", {}).BrowserUtils.makeURI;
-
-    const BASE_URI = "http://mochi.test:8888/chrome/dom/security/test/general/";
-    const FAVICON_URI = BASE_URI + "favicon_bug1277803.ico";
-    const LOADING_URI = BASE_URI + "bug1277803.html";
-    let testWindow; //will be used to trigger favicon load
-
-    let securityManager = Cc["@mozilla.org/scriptsecuritymanager;1"].
-                          getService(Ci.nsIScriptSecurityManager);
-    let expectedPrincipal = securityManager.createCodebasePrincipal(makeURI(LOADING_URI), {});
-    let systemPrincipal = Cc["@mozilla.org/systemprincipal;1"].createInstance();
-
-    // We expect 2 favicon loads, one from PlacesUIUtils.loadFavicon and one
-    // from XUL:image loads.
-    let requestXUL = false;
-    let requestPlaces = false;
-
-    function runTest() {
-      // Register our observer to intercept favicon requests.
-      let os = Cc["@mozilla.org/observer-service;1"].
-               getService(Ci.nsIObserverService);
-      let observer = {
-        observe: function(aSubject, aTopic, aData)
-        {
-          // Make sure this is a favicon request.
-          let httpChannel = aSubject.QueryInterface(Ci.nsIHttpChannel);
-          if (FAVICON_URI != httpChannel.URI.spec) {
-            return;
-          }
-
-          // Ensure the topic is the one we set an observer for.
-          is(aTopic, "http-on-modify-request", "Expected observer topic");
-
-          // Check for the correct loadingPrincipal, triggeringPrincipal.
-          let triggeringPrincipal = httpChannel.loadInfo.triggeringPrincipal;
-          let loadingPrincipal = httpChannel.loadInfo.loadingPrincipal;
-
-          if (loadingPrincipal.equals(systemPrincipal)) {
-            // This is the favicon loading from XUL, which will have the system
-            // principal as its loading principal and have a content principal
-            // as its triggering principal.
-            ok(triggeringPrincipal.equals(expectedPrincipal),
-              "Correct triggeringPrincipal for favicon from XUL.");
-            requestXUL = true;
-          } else if (loadingPrincipal.equals(expectedPrincipal)) {
-            // This is the favicon loading from Places, which will have a
-            // content principal as its loading principal and triggering
-            // principal.
-            ok(triggeringPrincipal.equals(expectedPrincipal),
-              "Correct triggeringPrincipal for favicon from Places.");
-            requestPlaces = true;
-          } else {
-            ok(false, "An unexpected favicon request.")
-          }
-
-          // Cleanup after ourselves...
-          if (requestXUL && requestPlaces) {
-            os.removeObserver(this, "http-on-modify-request");
-            SimpleTest.finish();
-          }
-        }
-      }
-      os.addObserver(observer, "http-on-modify-request", false);
-
-      // Now that the observer is set up, trigger a favicon load with navigation
-      testWindow = window.open(LOADING_URI);
-    }
-
-    SimpleTest.waitForExplicitFinish();
-    SimpleTest.registerCleanupFunction(function() {
-      if (testWindow) {
-        testWindow.close();
-      }
-    });
-  ]]></script>
-
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
-</window>
--- a/dom/security/test/moz.build
+++ b/dom/security/test/moz.build
@@ -17,16 +17,15 @@ MOCHITEST_MANIFESTS += [
     'csp/mochitest.ini',
     'general/mochitest.ini',
     'mixedcontentblocker/mochitest.ini',
     'sri/mochitest.ini',
 ]
 
 MOCHITEST_CHROME_MANIFESTS += [
     'csp/chrome.ini',
-    'general/chrome.ini',
 ]
 
 BROWSER_CHROME_MANIFESTS += [
     'contentverifier/browser.ini',
     'csp/browser.ini',
     'hsts/browser.ini',
 ]