Bug 1480319: Follow-up: Don't try to guess favicons during WebRequest test. r=bustage CLOSED TREE
☠☠ backed out by e19fc7991514 ☠ ☠
authorKris Maglione <maglione.k@gmail.com>
Wed, 15 Aug 2018 14:34:51 -0700
changeset 486909 0161b3bbc9d21cb915ffb3fe6b0aead720141c0b
parent 486908 9b421c484e49a94345cbf82dd4efa8155a326e5c
child 486910 083414a62ea15be84270efc2bc86bb358a3b22f1
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1480319
milestone63.0a1
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
Bug 1480319: Follow-up: Don't try to guess favicons during WebRequest test. r=bustage CLOSED TREE
toolkit/components/extensions/test/mochitest/test_ext_webrequest_basic.html
--- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_basic.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_basic.html
@@ -35,17 +35,18 @@ add_task(async function setup() {
   let cache = imgTools.getImgCacheForDocument(document);
   cache.clearCache(false);
   function clearCache() {
     ChromeUtils.import("resource://gre/modules/Services.jsm", {}).Services.cache2.clear();
   }
   SpecialPowers.loadChromeScript(clearCache);
 
   await SpecialPowers.pushPrefEnv({
-    set: [["network.http.rcwn.enabled", false]],
+    set: [["network.http.rcwn.enabled", false],
+          ["browser.chrome.guess_favicon", false]],
   });
 
   extension = makeExtension();
   await extension.startup();
 });
 
 // expect is a set of test values used by the background script.
 //
@@ -272,24 +273,16 @@ add_task(async function test_webRequest_
 
   let linkUrl = `file_WebRequest_page3.html?trigger=a&nocache=${Math.random()}`;
   let expect = {
     "file_WebRequest_page3.html": {
       type: "main_frame",
     },
   };
 
-  if (AppConstants.platform != "android") {
-    expect["favicon.ico"] = {
-      type: "image",
-      origin: SimpleTest.getTestFileURL(linkUrl),
-      cached: false,
-    };
-  }
-
   extension.sendMessage("set-expected", {expect, origin: location.href});
   await extension.awaitMessage("continue");
   let a = addLink(linkUrl);
   a.click();
   await extension.awaitMessage("done");
 
   let closed = tabExt.awaitMessage("tab-closed");
   tabExt.sendMessage("close-tab");
@@ -326,24 +319,16 @@ add_task(async function test_webRequest_
   });
 
   let expect = {
     "file_sample.html": {
       type: "main_frame",
     },
   };
 
-  if (AppConstants.platform != "android") {
-    expect["favicon.ico"] = {
-      type: "image",
-      origin: pageUrl,
-      cached: true,
-    };
-  }
-
   await tabExt.startup();
   let origin = await tabExt.awaitMessage("origin");
 
   // expecting origin == extension baseUrl
   extension.sendMessage("set-expected", {expect, origin});
   await extension.awaitMessage("continue");
 
   // open a tab from an extension principal