Issue #1208: Remove `services.sync.enabled` pref.

Sync will not do anything unless specifically set up to do so and at
least one engine is enabled, so there's no need for this "master switch"
to force it disabled based on engines being disabled (which was its
previous function to shortcut syncing in that situation).

3 files changed, 3 insertions, 24 deletions

diff --git a/services/sync/modules/service.js b/services/sync/modules/service.js
index 15884aca00..804eb20cdd 100644
--- a/services/sync/modules/service.js
+++ b/services/sync/modules/service.js
@@ -296,21 +296,6 @@ Sync11Service.prototype = {
     return false;
   },
 
-  // The global "enabled" state comes from prefs, and will be set to false
-  // whenever the UI that exposes what to sync finds all Sync engines disabled.
-  get enabled() {
-    return Svc.Prefs.get("enabled");
-  },
-  set enabled(val) {
-    // There's no real reason to impose this other than to catch someone doing
-    // something we don't expect with bad consequences - all setting of this
-    // pref are in the UI code and external to this module.
-    if (val) {
-      throw new Error("Only disabling via this setter is supported");
-    }
-    Svc.Prefs.set("enabled", val);
-  },
-
   /**
    * Prepare to initialize the rest of Weave after waiting a little bit
    */
@@ -340,6 +325,8 @@ Sync11Service.prototype = {
     this._clusterManager = this.identity.createClusterManager(this);
     this.recordManager = new RecordManager(this);
 
+    this.enabled = true;
+
     this._registerEngines();
 
     let ua = Cc["@mozilla.org/network/protocol;1?name=http"].
@@ -1236,10 +1223,6 @@ Sync11Service.prototype = {
   },
 
   sync: function sync() {
-    if (!this.enabled) {
-      this._log.debug("Not syncing as Sync is disabled.");
-      return;
-    }
     let dateStr = new Date().toLocaleFormat(LOG_DATE_FORMAT);
     this._log.debug("User-Agent: " + SyncStorageRequest.prototype.userAgent);
     this._log.info("Starting sync at " + dateStr);
diff --git a/services/sync/services-sync.js b/services/sync/services-sync.js
index 640fb4abc5..dfce84767f 100644
--- a/services/sync/services-sync.js
+++ b/services/sync/services-sync.js
@@ -24,10 +24,6 @@ pref("services.sync.scheduler.sync11.singleDeviceInterval", 86400); // 1 day
 
 pref("services.sync.errorhandler.networkFailureReportTimeout", 1209600); // 2 weeks
 
-// A "master" pref for Sync being enabled. Will be set to false if the sync
-// customization UI finds all our builtin engines disabled (and addons are
-// free to force this to true if they have their own engine)
-pref("services.sync.enabled", true);
 // Our engines.
 pref("services.sync.engine.addons", false);
 pref("services.sync.engine.bookmarks", true);
diff --git a/services/sync/tests/unit/test_service_login.js b/services/sync/tests/unit/test_service_login.js
index 52ee5e63ab..2ecb0a377b 100644
--- a/services/sync/tests/unit/test_service_login.js
+++ b/services/sync/tests/unit/test_service_login.js
@@ -183,7 +183,7 @@ add_test(function test_login_on_sync() {
     // This test exercises these two branches.
 
     _("We're ready to sync if locked.");
-    Svc.Prefs.set("enabled", true);
+    Service.enabled = true;
     Services.io.offline = false;
     Service.scheduler.checkSyncStatus();
     do_check_true(scheduleCalled);