From ad6ef37fd908f6e015faf4853169acbdcbca22de Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vvingtetun.org>
Date: Thu, 22 Jul 2010 01:56:15 +0200
Subject: [PATCH] Bug 580676 - Add content prefs service service to
 Services.jsm [r=gavin]

---
 toolkit/content/Services.jsm                      | 4 ++++
 toolkit/content/tests/browser/browser_Services.js | 1 +
 2 files changed, 5 insertions(+)

diff --git a/toolkit/content/Services.jsm b/toolkit/content/Services.jsm
index 2ff49d2a6e1d..4d6a82866bf2 100644
--- a/toolkit/content/Services.jsm
+++ b/toolkit/content/Services.jsm
@@ -61,6 +61,10 @@ XPCOMUtils.defineLazyGetter(Services, "dirsvc", function () {
            .QueryInterface(Ci.nsIProperties);
 });
 
+XPCOMUtils.defineLazyServiceGetter(Services, "contentPrefs",
+                                   "@mozilla.org/content-pref/service;1",
+                                   "nsIContentPrefService");
+
 XPCOMUtils.defineLazyServiceGetter(Services, "wm",
                                    "@mozilla.org/appshell/window-mediator;1",
                                    "nsIWindowMediator");
diff --git a/toolkit/content/tests/browser/browser_Services.js b/toolkit/content/tests/browser/browser_Services.js
index 569c97bcab4c..311de6a2e5ab 100644
--- a/toolkit/content/tests/browser/browser_Services.js
+++ b/toolkit/content/tests/browser/browser_Services.js
@@ -48,6 +48,7 @@ function checkService(service, interface) {
 function checkServices() {
   checkService("prefs", Ci.nsIPrefBranch2);
   checkService("prefs", Ci.nsIPrefService);
+  checkService("contentPrefs", Ci.nsIContentPrefService);
   checkService("wm", Ci.nsIWindowMediator);
   checkService("perms", Ci.nsIPermissionManager);
   checkService("io", Ci.nsIIOService);