From 2e2952f0c1c265b2a35aabd0bb34bc98cb8b5977 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 6 Jul 2013 15:10:04 -0700
Subject: [PATCH] Workaround QueryInterface not properly mutating
 services.contentPrefs.

---
 common/modules/sanitizer.jsm | 1 -
 common/modules/services.jsm  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm
index 9b4eb547..13644568 100644
--- a/common/modules/sanitizer.jsm
+++ b/common/modules/sanitizer.jsm
@@ -70,7 +70,6 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
 
         util.addObserver(this);
 
-        services.add("contentPrefs", "@mozilla.org/content-pref/service;1", Ci.nsIContentPrefService);
         services.add("cookies",      "@mozilla.org/cookiemanager;1",        [Ci.nsICookieManager, Ci.nsICookieManager2,
                                                                              Ci.nsICookieService]);
         services.add("loginManager", "@mozilla.org/login-manager;1",        Ci.nsILoginManager);
diff --git a/common/modules/services.jsm b/common/modules/services.jsm
index d440b011..5ee191da 100644
--- a/common/modules/services.jsm
+++ b/common/modules/services.jsm
@@ -126,7 +126,7 @@ var Services = Module("Services", {
             if (!service.interfaces.length)
                 return res.wrappedJSObject || res;
 
-            service.interfaces.forEach(function (iface) res.QueryInterface(Ci[iface]));
+            service.interfaces.forEach(function (iface) res instanceof Ci[iface]);
             if (service.init && args.length) {
                 if (service.callable)
                     res[service.init].apply(res, args);