Bug 1602940 - Automated replacements to use Services.uuid. r=Gijs,necko-reviewers,preferences-reviewers,kershaw

Depends on D124391

Differential Revision: https://phabricator.services.mozilla.com/D124392

browser/base/content/test/plugins/BlocklistTestProxy.jsm

@@ -29,9 +29,7 @@ var BlocklistProxy = {
 
   init() {
     if (!this._uuid) {
-      this._uuid = Cc["@mozilla.org/uuid-generator;1"]
+      this._uuid = Services.uuid.generateUUID();
-        .getService(Ci.nsIUUIDGenerator)
-        .generateUUID();
       Cm.nsIComponentRegistrar.registerFactory(
         this._uuid,
         "",

browser/base/content/test/tabs/browser_reload_deleted_file.js

@@ -1,9 +1,7 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 
-const uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+const uuidGenerator = Services.uuid;
-  Ci.nsIUUIDGenerator
-);
 
 const DUMMY_FILE = "dummy_page.html";
 

browser/components/attribution/test/browser/browser_AttributionCode_Mac_telemetry.js

@@ -198,8 +198,7 @@ add_task(async function test_broken_referrer() {
   // application has quarantine data but nothing will be pressent in the
   // quarantine database.  This shouldn't happen in the wild.
   function generateQuarantineGUID() {
-    let str = Cc["@mozilla.org/uuid-generator;1"]
+    let str = Services.uuid
-      .getService(Ci.nsIUUIDGenerator)
       .generateUUID()
       .toString()
       .toUpperCase();

browser/components/ion/content/ion.js

@@ -402,10 +402,7 @@ async function updateStudy(studyAddonId) {
 // equivalent to what we use for Telemetry IDs
 // https://searchfox.org/mozilla-central/rev/9193635dca8cfdcb68f114306194ffc860456044/toolkit/components/telemetry/app/TelemetryUtils.jsm#222
 function generateUUID() {
-  let str = Cc["@mozilla.org/uuid-generator;1"]
+  let str = Services.uuid.generateUUID().toString();
-    .getService(Ci.nsIUUIDGenerator)
-    .generateUUID()
-    .toString();
   return str.substring(1, str.length - 1);
 }
 

browser/components/preferences/tests/browser_advanced_update.js

@@ -5,9 +5,7 @@
 
 const Cm = Components.manager;
 
-const uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+const uuidGenerator = Services.uuid;
-  Ci.nsIUUIDGenerator
-);
 
 const mockUpdateManager = {
   contractId: "@mozilla.org/updates/update-manager;1",

browser/components/shell/test/browser_1119088.js

@@ -105,9 +105,7 @@ add_task(async function() {
       let dirSvc = Cc["@mozilla.org/file/directory_service;1"].getService(
         Ci.nsIDirectoryServiceProvider
       );
-      let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+      let uuidGenerator = Services.uuid;
-        Ci.nsIUUIDGenerator
-      );
       let shellSvc = Cc["@mozilla.org/browser/shell-service;1"].getService(
         Ci.nsIShellService
       );

browser/modules/test/browser/browser_ProcessHangNotifications.js

@@ -109,9 +109,7 @@ let buttonCount = AppConstants.MOZ_DEV_EDITION ? 2 : 1;
 add_task(async function setup() {
   // Create a fake WebExtensionPolicy that we can use for
   // the add-on hang notification.
-  const uuidGen = Cc["@mozilla.org/uuid-generator;1"].getService(
+  const uuidGen = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   const uuid = uuidGen.generateUUID().number.slice(1, -1);
   let policy = new WebExtensionPolicy({
     name: "Scapegoat",

browser/modules/test/browser/browser_UnsubmittedCrashHandler.js

@@ -106,9 +106,7 @@ function createPendingCrashReports(howMany, accessDate) {
     return Promise.all(promises);
   };
 
-  let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  let uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   // Some annotations are always present in the .extra file and CrashSubmit.jsm
   // expects there to be a ServerURL entry, so we'll add them here.
   let extraFileContents = JSON.stringify({

chrome/test/unit/test_data_protocol_registration.js

@@ -8,9 +8,7 @@ var manifests = [do_get_file("data/test_data_protocol_registration.manifest")];
 registerManifests(manifests);
 
 function run_test() {
-  const uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  const uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
 
   let newAppInfo = ChromeUtils.import(
     "resource://testing-common/AppInfo.jsm",

chrome/test/unit/test_no_remote_registration.js

@@ -66,9 +66,7 @@ function run_test() {
     platformVersion: "1.9",
   });
 
-  const uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  const uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
 
   let XULAppInfoFactory = {
     // These two are used when we register all our factories (and unregister)

devtools/shared/generate-uuid.js

@@ -5,9 +5,7 @@
 "use strict";
 
 const { Cc, Ci } = require("chrome");
-const { generateUUID } = Cc["@mozilla.org/uuid-generator;1"].getService(
+const { generateUUID } = Services.uuid;
-  Ci.nsIUUIDGenerator
-);
 
 /**
  * Returns a new `uuid`.

devtools/shared/tests/xpcshell/test_console_filtering.js

@@ -34,9 +34,7 @@ registerCleanupFunction(() => {
 });
 
 function createFakeAddonWindow({ addonId } = {}) {
-  const uuidGen = Cc["@mozilla.org/uuid-generator;1"].getService(
+  const uuidGen = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   const uuid = uuidGen.generateUUID().number.slice(1, -1);
 
   if (policy) {

dom/push/PushServiceWebSocket.jsm

@@ -867,9 +867,7 @@ var PushServiceWebSocket = {
   },
 
   _generateID() {
-    let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+    let uuidGenerator = Services.uuid;
-      Ci.nsIUUIDGenerator
-    );
     // generateUUID() gives a UUID surrounded by {...}, slice them off.
     return uuidGenerator
       .generateUUID()

dom/tests/browser/browser_ConsoleAPI_originAttributes.js

@@ -64,9 +64,7 @@ function test() {
 
   waitForExplicitFinish();
 
-  let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  let uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   let uuid = uuidGenerator.generateUUID().number;
   uuid = uuid.slice(1, -1); // Strip { and } off the UUID.
 

extensions/permissions/test/unit/test_permmanager_migrate_4-7_no_history.js

@@ -18,9 +18,7 @@ var factory = {
   QueryInterface: ChromeUtils.generateQI(["nsIFactory"]),
 };
 
-var newClassID = Cc["@mozilla.org/uuid-generator;1"]
+var newClassID = Services.uuid.generateUUID();
-  .getService(Ci.nsIUUIDGenerator)
-  .generateUUID();
 
 var registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
 var oldClassID = registrar.contractIDToCID(CONTRACT_ID);

netwerk/dns/mdns/libmdns/DNSServiceDiscovery.jsm

@@ -23,9 +23,7 @@ function log(aMsg) {
 }
 
 function generateUuid() {
-  var uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  var uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   return uuidGenerator.generateUUID().toString();
 }
 

security/sandbox/test/browser_content_sandbox_utils.js

@@ -2,9 +2,7 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
-const uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+const uuidGenerator = Services.uuid;
-  Ci.nsIUUIDGenerator
-);
 const environment = Cc["@mozilla.org/process/environment;1"].getService(
   Ci.nsIEnvironment
 );

services/common/utils.js

@@ -513,10 +513,7 @@ var CommonUtils = {
    * @return string A hex-formatted UUID string.
    */
   generateUUID: function generateUUID() {
-    let uuid = Cc["@mozilla.org/uuid-generator;1"]
+    let uuid = Services.uuid.generateUUID().toString();
-      .getService(Ci.nsIUUIDGenerator)
-      .generateUUID()
-      .toString();
 
     return uuid.substring(1, uuid.length - 1);
   },

services/fxaccounts/FxAccountsTelemetry.jsm

@@ -48,8 +48,7 @@ class FxAccountsTelemetry {
   }
 
   generateUUID() {
-    return Cc["@mozilla.org/uuid-generator;1"]
+    return Services.uuid
-      .getService(Ci.nsIUUIDGenerator)
       .generateUUID()
       .toString()
       .slice(1, -1);

testing/mochitest/BrowserTestUtils/content/content-about-page-utils.js

@@ -6,9 +6,7 @@ var Cm = Components.manager;
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
-const { generateUUID } = Cc["@mozilla.org/uuid-generator;1"].getService(
+const { generateUUID } = Services.uuid;
-  Ci.nsIUUIDGenerator
-);
 
 function AboutPage(aboutHost, chromeURL, uriFlags) {
   this.chromeURL = chromeURL;

testing/specialpowers/content/AppTestDelegateParent.jsm

@@ -15,9 +15,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   AppUiTestDelegate: "resource://testing-common/AppUiTestDelegate.jsm",
 });
 
-const UUIDGen = Cc["@mozilla.org/uuid-generator;1"].getService(
+const UUIDGen = Services.uuid;
-  Ci.nsIUUIDGenerator
-);
 
 class AppTestDelegateParent extends JSWindowActorParent {
   constructor() {

testing/specialpowers/content/MockColorPicker.jsm

@@ -18,9 +18,7 @@ Cu.crashIfNotInAutomation();
 
 var registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
 var oldClassID = "";
-var newClassID = Cc["@mozilla.org/uuid-generator;1"]
+var newClassID = Services.uuid.generateUUID();
-  .getService(Ci.nsIUUIDGenerator)
-  .generateUUID();
 var newFactory = function(window) {
   return {
     createInstance(aOuter, aIID) {

testing/specialpowers/content/MockFilePicker.jsm

@@ -28,9 +28,7 @@ if (__URI__.includes("specialpowers")) {
 
 var registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
 var oldClassID;
-var newClassID = Cc["@mozilla.org/uuid-generator;1"]
+var newClassID = Services.uuid.generateUUID();
-  .getService(Ci.nsIUUIDGenerator)
-  .generateUUID();
 var newFactory = function(window) {
   return {
     createInstance(aOuter, aIID) {

testing/specialpowers/content/MockPermissionPrompt.jsm

@@ -12,9 +12,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
 var oldClassID, oldFactory;
-var newClassID = Cc["@mozilla.org/uuid-generator;1"]
+var newClassID = Services.uuid.generateUUID();
-  .getService(Ci.nsIUUIDGenerator)
-  .generateUUID();
 var newFactory = {
   createInstance(aOuter, aIID) {
     if (aOuter) {

testing/specialpowers/content/SpecialPowersChild.jsm

@@ -594,9 +594,7 @@ class SpecialPowersChild extends JSWindowActorChild {
 
   loadChromeScript(urlOrFunction, sandboxOptions) {
     // Create a unique id for this chrome script
-    let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+    let uuidGenerator = Services.uuid;
-      Ci.nsIUUIDGenerator
-    );
     let id = uuidGenerator.generateUUID().toString();
 
     // Tells chrome code to evaluate this chrome script
@@ -1784,9 +1782,7 @@ class SpecialPowersChild extends JSWindowActorChild {
     if (cid) {
       componentRegistrar.unregisterFactory(currentCID, currentFactory);
     } else {
-      let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+      let uuidGenerator = Services.uuid;
-        Ci.nsIUUIDGenerator
-      );
       cid = uuidGenerator.generateUUID();
     }
 

toolkit/components/antitracking/test/browser/browser_staticPartition_CORS_preflight.js

@@ -12,9 +12,7 @@ const TEST_PREFLIGHT_PAGE =
   "http://example.net/browser/toolkit/components/antitracking/test/browser/browser_staticPartition_CORS_preflight.sjs";
 
 add_task(async function() {
-  let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  let uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
 
   for (let networkIsolation of [true, false]) {
     for (let partitionPerSite of [true, false]) {

toolkit/components/antitracking/test/browser/browser_staticPartition_saveAs.js

@@ -95,9 +95,7 @@ add_task(async function setup() {
 });
 
 add_task(async function testContextMenuSaveImage() {
-  let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  let uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
 
   for (let networkIsolation of [true, false]) {
     for (let partitionPerSite of [true, false]) {
@@ -192,9 +190,7 @@ add_task(async function testContextMenuSaveImage() {
 });
 
 add_task(async function testContextMenuSaveVideo() {
-  let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  let uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
 
   for (let networkIsolation of [true, false]) {
     for (let partitionPerSite of [true, false]) {

toolkit/components/autocomplete/tests/unit/head_autocomplete.js

@@ -176,9 +176,7 @@ AutocompletePopupBase.prototype = {
  */
 function registerAutoCompleteSearch(aSearch) {
   var name = "@mozilla.org/autocomplete/search;1?name=" + aSearch.name;
-  var cid = Cc["@mozilla.org/uuid-generator;1"]
+  var cid = Services.uuid.generateUUID();
-    .getService(Ci.nsIUUIDGenerator)
-    .generateUUID();
 
   var desc = "Test AutoCompleteSearch";
   var componentManager = Components.manager.QueryInterface(

toolkit/components/autocomplete/tests/unit/test_378079.js

@@ -162,9 +162,7 @@ AutoCompleteSearch.prototype = {
 function registerAutoCompleteSearch(aSearch) {
   var name = "@mozilla.org/autocomplete/search;1?name=" + aSearch.name;
 
-  var uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  var uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   var cid = uuidGenerator.generateUUID();
 
   var desc = "Test AutoCompleteSearch";

toolkit/components/autocomplete/tests/unit/test_393191.js

@@ -161,9 +161,7 @@ AutoCompleteSearch.prototype = {
 function registerAutoCompleteSearch(aSearch) {
   var name = "@mozilla.org/autocomplete/search;1?name=" + aSearch.name;
 
-  var uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  var uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   var cid = uuidGenerator.generateUUID();
 
   var desc = "Test AutoCompleteSearch";

toolkit/components/autocomplete/tests/unit/test_440866.js

@@ -160,9 +160,7 @@ AutoCompleteSearch.prototype = {
 function registerAutoCompleteSearch(aSearch) {
   var name = "@mozilla.org/autocomplete/search;1?name=" + aSearch.name;
 
-  var uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  var uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   var cid = uuidGenerator.generateUUID();
 
   var desc = "Test AutoCompleteSearch";

toolkit/components/autocomplete/tests/unit/test_autocomplete_multiple.js

@@ -164,9 +164,7 @@ AutoCompleteSearch.prototype = {
 function registerAutoCompleteSearch(aSearch) {
   var name = "@mozilla.org/autocomplete/search;1?name=" + aSearch.name;
 
-  var uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  var uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   var cid = uuidGenerator.generateUUID();
 
   var desc = "Test AutoCompleteSearch";

toolkit/components/autocomplete/tests/unit/test_previousResult.js

@@ -164,9 +164,7 @@ AutoCompleteSearch.prototype = {
 function registerAutoCompleteSearch(aSearch) {
   var name = "@mozilla.org/autocomplete/search;1?name=" + aSearch.name;
 
-  var uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  var uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   var cid = uuidGenerator.generateUUID();
 
   var desc = "Test AutoCompleteSearch";

toolkit/components/autocomplete/tests/unit/test_stopSearch.js

@@ -83,9 +83,7 @@ AutoCompleteSearch.prototype = {
  */
 function registerAutoCompleteSearch(aSearch) {
   let name = "@mozilla.org/autocomplete/search;1?name=" + aSearch.name;
-  let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  let uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   let cid = uuidGenerator.generateUUID();
   let desc = "Test AutoCompleteSearch";
   let componentManager = Components.manager.QueryInterface(

toolkit/components/backgroundtasks/tests/xpcshell/test_backgroundtask_deletes_profile.js

@@ -5,10 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 add_task(async function test_backgroundtask_deletes_profile() {
-  let sentinel = Cc["@mozilla.org/uuid-generator;1"]
+  let sentinel = Services.uuid.generateUUID().toString();
-    .getService(Ci.nsIUUIDGenerator)
-    .generateUUID()
-    .toString();
   sentinel = sentinel.substring(1, sentinel.length - 1);
 
   let stdoutLines = [];

toolkit/components/backgroundtasks/tests/xpcshell/test_backgroundtask_unique_profile.js

@@ -8,10 +8,7 @@
 // launched background task, etc.  This is an easy way to ensure that tasks are running concurrently
 // without requiring concurrency primitives.
 add_task(async function test_backgroundtask_unique_profile() {
-  let sentinel = Cc["@mozilla.org/uuid-generator;1"]
+  let sentinel = Services.uuid.generateUUID().toString();
-    .getService(Ci.nsIUUIDGenerator)
-    .generateUUID()
-    .toString();
   sentinel = sentinel.substring(1, sentinel.length - 1);
 
   let count = 3;

toolkit/components/cleardata/tests/browser/browser_preflight_cache.js

@@ -7,9 +7,7 @@ const { SiteDataTestUtils } = ChromeUtils.import(
   "resource://testing-common/SiteDataTestUtils.jsm"
 );
 
-const uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+const uuidGenerator = Services.uuid;
-  Ci.nsIUUIDGenerator
-);
 
 const ORIGIN_A = "http://example.net";
 const ORIGIN_B = "http://example.org";

toolkit/components/contentprefs/ContentPrefServiceChild.jsm

@@ -60,10 +60,7 @@ class ContentPrefsChild extends JSProcessActorChild {
   }
 
   _getRandomId() {
-    return Cc["@mozilla.org/uuid-generator;1"]
+    return Services.uuid.generateUUID().toString();
-      .getService(Ci.nsIUUIDGenerator)
-      .generateUUID()
-      .toString();
   }
 
   receiveMessage(msg) {

toolkit/components/crashes/CrashManager.jsm

@@ -529,8 +529,7 @@ CrashManager.prototype = Object.freeze({
   generateSubmissionID() {
     return (
       "sub-" +
-      Cc["@mozilla.org/uuid-generator;1"]
+      Services.uuid
-        .getService(Ci.nsIUUIDGenerator)
         .generateUUID()
         .toString()
         .slice(1, -1)

toolkit/components/crashes/CrashManagerTest.jsm

@@ -54,10 +54,7 @@ TestingCrashManager.prototype = {
   __proto__: CrashManager.prototype,
 
   createDummyDump(submitted = false, date = new Date(), hr = false) {
-    let uuid = Cc["@mozilla.org/uuid-generator;1"]
+    let uuid = Services.uuid.generateUUID().toString();
-      .getService(Ci.nsIUUIDGenerator)
-      .generateUUID()
-      .toString();
     uuid = uuid.substring(1, uuid.length - 1);
 
     let path;

toolkit/components/extensions/ExtensionStorageSyncKinto.jsm

@@ -497,9 +497,7 @@ class CryptoCollection {
       // This is a new keyring. Invent an ID for this record. If this
       // changes, it means a client replaced the keyring, so we need to
       // reupload everything.
-      const uuidgen = Cc["@mozilla.org/uuid-generator;1"].getService(
+      const uuidgen = Services.uuid;
-        Ci.nsIUUIDGenerator
-      );
       const uuid = uuidgen.generateUUID().toString();
       data = { uuid, id: STORAGE_SYNC_CRYPTO_KEYRING_RECORD_ID };
     }

toolkit/components/extensions/test/xpcshell/test_ext_networkStatus.js

@@ -2,9 +2,7 @@
 
 const Cm = Components.manager;
 
-const uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+const uuidGenerator = Services.uuid;
-  Ci.nsIUUIDGenerator
-);
 
 var mockNetworkStatusService = {
   contractId: "@mozilla.org/network/network-link-service;1",

toolkit/components/extensions/test/xpcshell/test_ext_storage_sync_kinto.js

@@ -649,9 +649,7 @@ const loggedInUser = {
 };
 
 function uuid() {
-  const uuidgen = Cc["@mozilla.org/uuid-generator;1"].getService(
+  const uuidgen = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   return uuidgen.generateUUID().toString();
 }
 

toolkit/components/prompts/src/Prompter.jsm

@@ -1166,12 +1166,7 @@ class ModalPrompter {
     // It is technically possible for multiple prompts to be sent from a single
     // BrowsingContext. See bug 1266353. We use a randomly generated UUID to
     // differentiate between the different prompts.
-    let id =
+    let id = "id" + Services.uuid.generateUUID().toString();
-      "id" +
-      Cc["@mozilla.org/uuid-generator;1"]
-        .getService(Ci.nsIUUIDGenerator)
-        .generateUUID()
-        .toString();
 
     args._remoteId = id;
 

toolkit/components/taskscheduler/tests/xpcshell/test_TaskSchedulerMacOSImpl.js

@@ -41,9 +41,7 @@ function getFirefoxExecutableFile() {
   return file;
 }
 
-const uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+const uuidGenerator = Services.uuid;
-  Ci.nsIUUIDGenerator
-);
 
 function randomName() {
   return (

toolkit/components/taskscheduler/tests/xpcshell/test_TaskSchedulerWinImpl.js

@@ -24,9 +24,7 @@ const WinSvc = Cc["@mozilla.org/win-task-scheduler-service;1"].getService(
   Ci.nsIWinTaskSchedulerService
 );
 
-const uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+const uuidGenerator = Services.uuid;
-  Ci.nsIUUIDGenerator
-);
 
 function randomName() {
   return (

toolkit/components/taskscheduler/tests/xpcshell/test_WinTaskSchedulerService.js

@@ -9,9 +9,7 @@ const svc = Cc["@mozilla.org/win-task-scheduler-service;1"].getService(
   Ci.nsIWinTaskSchedulerService
 );
 
-const uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+const uuidGenerator = Services.uuid;
-  Ci.nsIUUIDGenerator
-);
 
 function randomName() {
   return (

toolkit/components/telemetry/app/TelemetryUtils.jsm

@@ -207,10 +207,7 @@ var TelemetryUtils = {
   },
 
   generateUUID() {
-    let str = Cc["@mozilla.org/uuid-generator;1"]
+    let str = Services.uuid.generateUUID().toString();
-      .getService(Ci.nsIUUIDGenerator)
-      .generateUUID()
-      .toString();
     // strip {}
     return str.substring(1, str.length - 1);
   },

toolkit/components/telemetry/pings/TelemetrySession.jsm

@@ -68,10 +68,7 @@ XPCOMUtils.defineLazyServiceGetters(this, {
 });
 
 function generateUUID() {
-  let str = Cc["@mozilla.org/uuid-generator;1"]
+  let str = Services.uuid.generateUUID().toString();
-    .getService(Ci.nsIUUIDGenerator)
-    .generateUUID()
-    .toString();
   // strip {}
   return str.substring(1, str.length - 1);
 }

toolkit/crashreporter/test/browser/head.js

@@ -11,9 +11,7 @@ function create_subdir(dir, subdirname) {
 }
 
 function generate_uuid() {
-  let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  let uuidGenerator = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   let uuid = uuidGenerator.generateUUID().toString();
   // ditch the {}
   return uuid.substring(1, uuid.length - 1);

toolkit/mozapps/extensions/test/xpcshell/head_addons.js

@@ -1199,9 +1199,7 @@ async function mockGfxBlocklistItemsFromDisk(path) {
 }
 
 async function mockGfxBlocklistItems(items) {
-  const { generateUUID } = Cc["@mozilla.org/uuid-generator;1"].getService(
+  const { generateUUID } = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   let bsPass = ChromeUtils.import("resource://gre/modules/Blocklist.jsm", null);
   const client = RemoteSettings(
     Services.prefs.getCharPref("services.blocklist.gfx.collection"),

toolkit/mozapps/extensions/test/xpcshell/test_system_reset.js

@@ -35,9 +35,7 @@ registerDirectory("XREAppFeat", distroDir);
 createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "0");
 
 function makeUUID() {
-  let uuidGen = Cc["@mozilla.org/uuid-generator;1"].getService(
+  let uuidGen = Services.uuid;
-    Ci.nsIUUIDGenerator
-  );
   return uuidGen.generateUUID().toString();
 }
 

toolkit/mozapps/extensions/test/xpcshell/test_update_webextensions.js

@@ -6,9 +6,7 @@ Services.prefs.setBoolPref(PREF_EM_CHECK_UPDATE_SECURITY, false);
 var testserver = createHttpServer();
 gPort = testserver.identity.primaryPort;
 
-const uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+const uuidGenerator = Services.uuid;
-  Ci.nsIUUIDGenerator
-);
 
 const extensionsDir = gProfD.clone();
 extensionsDir.append("extensions");

uriloader/exthandler/tests/mochitest/HelperAppLauncherDialog_chromeScript.js

@@ -7,9 +7,7 @@ const HELPERAPP_DIALOG_CID = Components.ID(
   Cc[HELPERAPP_DIALOG_CONTRACT].number
 );
 
-const FAKE_CID = Cc["@mozilla.org/uuid-generator;1"]
+const FAKE_CID = Services.uuid.generateUUID();
-  .getService(Ci.nsIUUIDGenerator)
-  .generateUUID();
 /* eslint-env mozilla/frame-script */
 function HelperAppLauncherDialog() {}
 HelperAppLauncherDialog.prototype = {