From 9c966a087fa5bf5e8f9a264234f4e4dfecbd6768 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Fri, 30 Nov 2018 11:15:22 +0100
Subject: Remove fxAccountsEnabled()

---
 services/sync/modules/policies.js | 3 +--
 services/sync/modules/status.js   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'services/sync/modules')

diff --git a/services/sync/modules/policies.js b/services/sync/modules/policies.js
index 7a6c70445..2d85b1428 100644
--- a/services/sync/modules/policies.js
+++ b/services/sync/modules/policies.js
@@ -43,8 +43,7 @@ SyncScheduler.prototype = {
                     .getService(Ci.nsISupports)
                     .wrappedJSObject;
 
-    let part = service.fxAccountsEnabled ? "fxa" : "sync11";
-    let prefSDInterval = "scheduler." + part + ".singleDeviceInterval";
+    let prefSDInterval = "scheduler.sync11.singleDeviceInterval";
     this.singleDeviceInterval = Svc.Prefs.get(prefSDInterval) * 1000;
 
     this.idleInterval         = Svc.Prefs.get("scheduler.idleInterval")         * 1000;
diff --git a/services/sync/modules/status.js b/services/sync/modules/status.js
index 4b26f62bd..6d12d6711 100644
--- a/services/sync/modules/status.js
+++ b/services/sync/modules/status.js
@@ -28,7 +28,7 @@ this.Status = {
     let service = Components.classes["@mozilla.org/weave/service;1"]
                     .getService(Components.interfaces.nsISupports)
                     .wrappedJSObject;
-    let idClass = service.fxAccountsEnabled ? BrowserIDManager : IdentityManager;
+    let idClass = IdentityManager;
     this.__authManager = new idClass();
     // .initialize returns a promise, so we need to spin until it resolves.
     let cb = Async.makeSpinningCallback();
-- 
cgit v1.2.3