Backed out changeset a75c0f1d25e5 (bug 1532203) for xpcshell failures in test_clear_forgetAboutSite.js CLOSED TREE
authorNoemi Erli <nerli@mozilla.com>
Fri, 15 Mar 2019 13:50:39 +0200
changeset 525025 af8f24f10ce3fb0e5f06484d6f769569967f44d2
parent 525024 a75c0f1d25e5cc5e12af608a571d6894365e6583
child 525026 e0fb5aa748b0a6d617c25bc104e3d271151c45c9
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1532203
milestone67.0a1
backs outa75c0f1d25e5cc5e12af608a571d6894365e6583
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 a75c0f1d25e5 (bug 1532203) for xpcshell failures in test_clear_forgetAboutSite.js CLOSED TREE
toolkit/components/cleardata/ClearDataService.jsm
--- a/toolkit/components/cleardata/ClearDataService.jsm
+++ b/toolkit/components/cleardata/ClearDataService.jsm
@@ -80,68 +80,32 @@ const CookieCleaner = {
 
       aResolve();
     });
   },
 
 };
 
 const NetworkCacheCleaner = {
-  deleteByHost(aHost, aOriginAttributes) {
-    return new Promise(aResolve => {
-      // Delete data from both HTTP and HTTPS sites.
-      let httpURI = Services.io.newURI("http://" + aHost);
-      let httpsURI = Services.io.newURI("https://" + aHost);
-      let httpPrincipal = Services.scriptSecurityManager
-                                   .createCodebasePrincipal(httpURI, aOriginAttributes);
-      let httpsPrincipal = Services.scriptSecurityManager
-                                   .createCodebasePrincipal(httpsURI, aOriginAttributes);
-
-      Services.cache2.asyncClearOrigin(httpPrincipal);
-      Services.cache2.asyncClearOrigin(httpsPrincipal);
-      aResolve();
-    });
-  },
-
   deleteByPrincipal(aPrincipal) {
     return new Promise(aResolve => {
       Services.cache2.asyncClearOrigin(aPrincipal);
       aResolve();
     });
   },
 
   deleteAll() {
     return new Promise(aResolve => {
       Services.cache2.clear();
       aResolve();
     });
   },
 };
 
 const ImageCacheCleaner = {
-  deleteByHost(aHost, aOriginAttributes) {
-    return new Promise(aResolve => {
-      let imageCache = Cc["@mozilla.org/image/tools;1"]
-                         .getService(Ci.imgITools)
-                         .getImgCacheForDocument(null);
-
-      // Delete data from both HTTP and HTTPS sites.
-      let httpURI = Services.io.newURI("http://" + aHost);
-      let httpsURI = Services.io.newURI("https://" + aHost);
-      let httpPrincipal = Services.scriptSecurityManager
-                                   .createCodebasePrincipal(httpURI, aOriginAttributes);
-      let httpsPrincipal = Services.scriptSecurityManager
-                                   .createCodebasePrincipal(httpsURI, aOriginAttributes);
-
-      imageCache.removeEntriesFromPrincipal(httpPrincipal);
-      imageCache.removeEntriesFromPrincipal(httpsPrincipal);
-      aResolve();
-    });
-  },
-
   deleteByPrincipal(aPrincipal) {
     return new Promise(aResolve => {
       let imageCache = Cc["@mozilla.org/image/tools;1"]
                          .getService(Ci.imgITools)
                          .getImgCacheForDocument(null);
       imageCache.removeEntriesFromPrincipal(aPrincipal);
       aResolve();
     });