Rename policy SyncSettings to Sync

1rneh · 1rneh · commit aebf2aa2402c · 2026-02-18T17:31:39.000+01:00
diff --git a/browser/components/enterprisepolicies/Policies.sys.mjs b/browser/components/enterprisepolicies/Policies.sys.mjs
@@ -3928,14 +3928,14 @@ function processMIMEInfo(mimeInfo, realMIMEInfo) {
 
 if (AppConstants.MOZ_ENTERPRISE) {
   ChromeUtils.defineESModuleGetters(lazy, {
-    SyncSettingsPolicy: "resource:///modules/policies/SyncSettingsPolicy.sys.mjs",
+    SyncPolicy: "resource:///modules/policies/SyncPolicy.sys.mjs",
   });
-  Policies.SyncSettings = {
+  Policies.Sync = {
     async onBeforeAddons(manager, param) {
-      await lazy.SyncSettingsPolicy.applySettings(manager, param);
+      await lazy.SyncPolicy.applySettings(manager, param);
     },
     async onRemove(manager, _) {
-      await lazy.SyncSettingsPolicy.restoreSettings(manager);
+      await lazy.SyncPolicy.restoreSettings(manager);
     }
   }
 }
diff --git a/browser/components/enterprisepolicies/helpers/SyncPolicy.sys.mjs b/browser/components/enterprisepolicies/helpers/SyncPolicy.sys.mjs
diff --git a/browser/components/enterprisepolicies/helpers/moz.build b/browser/components/enterprisepolicies/helpers/moz.build
@@ -14,7 +14,7 @@ EXTRA_JS_MODULES.policies += [
 
 if CONFIG["MOZ_ENTERPRISE"]:
     EXTRA_JS_MODULES.policies += [
-        "SyncSettingsPolicy.sys.mjs",
+        "SyncPolicy.sys.mjs",
     ]
 
 EXTRA_PP_JS_MODULES.policies += [
diff --git a/browser/components/enterprisepolicies/schemas/policies-schema.json b/browser/components/enterprisepolicies/schemas/policies-schema.json
@@ -1697,7 +1697,7 @@
       "required": ["Title", "URL"]
     },
 
-    "SyncSettings": {
+    "Sync": {
       "type": "object",
       "properties": {
         "State": {
diff --git a/browser/locales/en-US/browser/enterprise/enterprise-policies-descriptions.ftl b/browser/locales/en-US/browser/enterprise/enterprise-policies-descriptions.ftl
@@ -6,4 +6,4 @@ policy-BlocklistDomainBrowsedTelemetry = Enable and configure security logging/t
 policy-DownloadTelemetry = Enable and configure security logging/telemetry when a download is triggered.
 policy-EnterpriseStorageEncryption = Enable enterprise-managed primary password for encrypted storage.
 policy-PrintPageTelemetry = Enable and configure security logging/telemetry when a page is printed.
-policy-SyncSettings = Enable or disable sync and define which data to include.
+policy-Sync = Enable or disable sync and define which data to include.

Original file line number	Diff line number	Diff line change
`@@ -3928,14 +3928,14 @@ function processMIMEInfo(mimeInfo, realMIMEInfo) {`
`3928`	`3928`
`3929`	`3929`	`if (AppConstants.MOZ_ENTERPRISE) {`
`3930`	`3930`	`ChromeUtils.defineESModuleGetters(lazy, {`
`3931`		`- SyncSettingsPolicy: "resource:///modules/policies/SyncSettingsPolicy.sys.mjs",`
	`3931`	`+ SyncPolicy: "resource:///modules/policies/SyncPolicy.sys.mjs",`
`3932`	`3932`	`});`
`3933`		`- Policies.SyncSettings = {`
	`3933`	`+ Policies.Sync = {`
`3934`	`3934`	`async onBeforeAddons(manager, param) {`
`3935`		`- await lazy.SyncSettingsPolicy.applySettings(manager, param);`
	`3935`	`+ await lazy.SyncPolicy.applySettings(manager, param);`
`3936`	`3936`	`},`
`3937`	`3937`	`async onRemove(manager, _) {`
`3938`		`- await lazy.SyncSettingsPolicy.restoreSettings(manager);`
	`3938`	`+ await lazy.SyncPolicy.restoreSettings(manager);`
`3939`	`3939`	`}`
`3940`	`3940`	`}`
`3941`	`3941`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ EXTRA_JS_MODULES.policies += [`
`14`	`14`
`15`	`15`	`if CONFIG["MOZ_ENTERPRISE"]:`
`16`	`16`	`EXTRA_JS_MODULES.policies += [`
`17`		`- "SyncSettingsPolicy.sys.mjs",`
	`17`	`+ "SyncPolicy.sys.mjs",`
`18`	`18`	`]`
`19`	`19`
`20`	`20`	`EXTRA_PP_JS_MODULES.policies += [`