Bug 341270 use the pref service's contract ID for

nsIPrefService/nsIPrefBranch, instead of the nsPref one
patch by Ryan Jones <sciguyryan+bugzilla@gmail.com> r=bclary

js/tests/e4x/shell.js

@@ -236,10 +236,10 @@ function JavaScriptOptions()
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'JavaScriptOptions: unable to get @mozilla.org/preference;1';
+      throw 'JavaScriptOptions: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.
@@ -293,10 +293,10 @@ function (optionName, optionValue)
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'setOption: unable to get @mozilla.org/preference;1';
+      throw 'setOption: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.

js/tests/ecma/shell.js

@@ -756,10 +756,10 @@ function JavaScriptOptions()
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'JavaScriptOptions: unable to get @mozilla.org/preference;1';
+      throw 'JavaScriptOptions: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.
@@ -813,10 +813,10 @@ function (optionName, optionValue)
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'setOption: unable to get @mozilla.org/preference;1';
+      throw 'setOption: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.

js/tests/ecma_2/shell.js

@@ -321,10 +321,10 @@ function JavaScriptOptions()
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'JavaScriptOptions: unable to get @mozilla.org/preference;1';
+      throw 'JavaScriptOptions: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.
@@ -378,10 +378,10 @@ function (optionName, optionValue)
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'setOption: unable to get @mozilla.org/preference;1';
+      throw 'setOption: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.

js/tests/ecma_3/shell.js

@@ -387,10 +387,10 @@ function JavaScriptOptions()
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'JavaScriptOptions: unable to get @mozilla.org/preference;1';
+      throw 'JavaScriptOptions: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.
@@ -444,10 +444,10 @@ function (optionName, optionValue)
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'setOption: unable to get @mozilla.org/preference;1';
+      throw 'setOption: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.

js/tests/js1_1/shell.js

@@ -269,10 +269,10 @@ function JavaScriptOptions()
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'JavaScriptOptions: unable to get @mozilla.org/preference;1';
+      throw 'JavaScriptOptions: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.
@@ -326,10 +326,10 @@ function (optionName, optionValue)
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'setOption: unable to get @mozilla.org/preference;1';
+      throw 'setOption: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.

js/tests/js1_2/shell.js

@@ -243,10 +243,10 @@ function JavaScriptOptions()
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'JavaScriptOptions: unable to get @mozilla.org/preference;1';
+      throw 'JavaScriptOptions: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.
@@ -300,10 +300,10 @@ function (optionName, optionValue)
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'setOption: unable to get @mozilla.org/preference;1';
+      throw 'setOption: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.

js/tests/js1_3/shell.js

@@ -291,10 +291,10 @@ function JavaScriptOptions()
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'JavaScriptOptions: unable to get @mozilla.org/preference;1';
+      throw 'JavaScriptOptions: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.
@@ -348,10 +348,10 @@ function (optionName, optionValue)
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'setOption: unable to get @mozilla.org/preference;1';
+      throw 'setOption: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.

js/tests/js1_4/shell.js

@@ -292,10 +292,10 @@ function JavaScriptOptions()
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'JavaScriptOptions: unable to get @mozilla.org/preference;1';
+      throw 'JavaScriptOptions: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.
@@ -349,10 +349,10 @@ function (optionName, optionValue)
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'setOption: unable to get @mozilla.org/preference;1';
+      throw 'setOption: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.

js/tests/js1_5/shell.js

@@ -387,10 +387,10 @@ function JavaScriptOptions()
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'JavaScriptOptions: unable to get @mozilla.org/preference;1';
+      throw 'JavaScriptOptions: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.
@@ -444,10 +444,10 @@ function (optionName, optionValue)
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'setOption: unable to get @mozilla.org/preference;1';
+      throw 'setOption: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.

js/tests/js1_6/shell.js

@@ -388,10 +388,10 @@ function JavaScriptOptions()
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'JavaScriptOptions: unable to get @mozilla.org/preference;1';
+      throw 'JavaScriptOptions: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.
@@ -445,10 +445,10 @@ function (optionName, optionValue)
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'setOption: unable to get @mozilla.org/preference;1';
+      throw 'setOption: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.

js/tests/js1_7/shell.js

@@ -394,10 +394,10 @@ function JavaScriptOptions()
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'JavaScriptOptions: unable to get @mozilla.org/preference;1';
+      throw 'JavaScriptOptions: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.
@@ -451,10 +451,10 @@ function (optionName, optionValue)
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'setOption: unable to get @mozilla.org/preference;1';
+      throw 'setOption: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.

js/tests/lc2/shell.js

@@ -316,10 +316,10 @@ function JavaScriptOptions()
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'JavaScriptOptions: unable to get @mozilla.org/preference;1';
+      throw 'JavaScriptOptions: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.
@@ -373,10 +373,10 @@ function (optionName, optionValue)
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'setOption: unable to get @mozilla.org/preference;1';
+      throw 'setOption: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.

js/tests/lc3/shell.js

@@ -328,10 +328,10 @@ function JavaScriptOptions()
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'JavaScriptOptions: unable to get @mozilla.org/preference;1';
+      throw 'JavaScriptOptions: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.
@@ -385,10 +385,10 @@ function (optionName, optionValue)
     // browser
     netscape.security.PrivilegeManager.enablePrivilege(this.privileges);
 
-    var preferences = Components.classes['@mozilla.org/preferences;1'];
+    var preferences = Components.classes['@mozilla.org/preferences-service;1'];
     if (!preferences)
     {
-      throw 'setOption: unable to get @mozilla.org/preference;1';
+      throw 'setOption: unable to get @mozilla.org/preferences-service;1';
     }
 
     var prefService = preferences.