Rebase on master

1 files changed, 10 insertions, 4 deletions

diff --git a/application/palemoon/modules/QuotaManager.jsm b/application/palemoon/modules/QuotaManager.jsm
index e03161a69..48cfe88b3 100644
--- a/application/palemoon/modules/QuotaManager.jsm
+++ b/application/palemoon/modules/QuotaManager.jsm
@@ -6,8 +6,9 @@ this.EXPORTED_SYMBOLS = ["QuotaManagerHelper"];
 
 Components.utils.import('resource://gre/modules/Services.jsm');
 
-const Cc = Components.classes;
 const Ci = Components.interfaces;
+const Cc = Components.classes;
+const Cu = Components.utils;
 
 this.QuotaManagerHelper = {
   clear: function(isShutDown) {
@@ -34,12 +35,17 @@ this.QuotaManagerHelper = {
             }
           }
         }
-        var qm = Cc["@mozilla.org/dom/quota/manager;1"].getService(Ci.nsIQuotaManager);
+        var qm = Cc["@mozilla.org/dom/quota-manager-service;1"]
+                 .getService(Ci.nsIQuotaManagerService);
         for (var dom in doms) {
           var uri = Services.io.newURI(dom, null, null);
-          qm.clearStoragesForURI(uri);
+          let principal = Services.scriptSecurityManager
+                          .createCodebasePrincipal(uri, {});
+          qm.clearStoragesForPrincipal(principal);
         }
       }
-    } catch(er) {}
+    } catch(er) {
+      Cu.reportError(er);
+    }
   }
 };