Bug 986475 - Remove the classinfo from SettingsService and SettingsServiceLock; r=bzbarsky
authorEhsan Akhgari <ehsan@mozilla.com>
Sat, 22 Mar 2014 09:56:17 -0400
changeset 174877 32d9c0261e6cf85fefa0dc4078600a328ff18332
parent 174876 8043163876f95823624c0d707e7a791b82ada232
child 174878 6c8aa44d0b58205a702fec546cdc806eadc5458e
push id41385
push usereakhgari@mozilla.com
push dateSat, 22 Mar 2014 13:57:55 +0000
treeherdermozilla-inbound@32d9c0261e6c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbzbarsky
bugs986475
milestone31.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 986475 - Remove the classinfo from SettingsService and SettingsServiceLock; r=bzbarsky These objects are not exposed to Web content, so they don't need the classinfo.
dom/settings/SettingsService.js
--- a/dom/settings/SettingsService.js
+++ b/dom/settings/SettingsService.js
@@ -176,23 +176,17 @@ SettingsServiceLock.prototype = {
                              intent: "set", 
                              name: aName, 
                              value: this._settingsService._settingsDB.prepareValue(aValue),
                              message: aMessage });
     this.createTransactionAndProcess();
   },
 
   classID : SETTINGSSERVICELOCK_CID,
-  QueryInterface : XPCOMUtils.generateQI([nsISettingsServiceLock]),
-
-  classInfo : XPCOMUtils.generateCI({ classID: SETTINGSSERVICELOCK_CID,
-                                      contractID: SETTINGSSERVICELOCK_CONTRACTID,
-                                      classDescription: "SettingsServiceLock",
-                                      interfaces: [nsISettingsServiceLock],
-                                      flags: nsIClassInfo.DOM_OBJECT })
+  QueryInterface : XPCOMUtils.generateQI([nsISettingsServiceLock])
 };
 
 const SETTINGSSERVICE_CID        = Components.ID("{f656f0c0-f776-11e1-a21f-0800200c9a66}");
 
 function SettingsService()
 {
   debug("settingsService Constructor");
   this._locks = new Queue();
@@ -216,18 +210,12 @@ SettingsService.prototype = {
       function() { lock.createTransactionAndProcess(aCallback); },
       function() { dump("SettingsService failed to open DB!\n"); }
     );
     this.nextTick(function() { this._open = false; }, lock);
     return lock;
   },
 
   classID : SETTINGSSERVICE_CID,
-  QueryInterface : XPCOMUtils.generateQI([Ci.nsISettingsService]),
-  classInfo: XPCOMUtils.generateCI({
-    classID: SETTINGSSERVICE_CID,
-    contractID: "@mozilla.org/settingsService;1",
-    interfaces: [Ci.nsISettingsService],
-    flags: nsIClassInfo.DOM_OBJECT
-  })
+  QueryInterface : XPCOMUtils.generateQI([Ci.nsISettingsService])
 }
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SettingsService, SettingsServiceLock])