backport uxp #812: Remove fxAccountsEnabled checks.

4 files changed, 13 insertions, 81 deletions

diff --git a/base/content/browser-syncui.js b/base/content/browser-syncui.js
index 3a57140..b796e66 100644
--- a/base/content/browser-syncui.js
+++ b/base/content/browser-syncui.js
@@ -4,11 +4,6 @@
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-#ifdef MOZ_SERVICES_CLOUDSYNC
-XPCOMUtils.defineLazyModuleGetter(this, "CloudSync",
-                                  "resource://gre/modules/CloudSync.jsm");
-#endif
-
 XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts",
                                   "resource://gre/modules/FxAccounts.jsm");
 
@@ -98,14 +93,6 @@ var gSyncUI = {
   // Returns a promise that resolves with true if Sync needs to be configured,
   // false otherwise.
   _needsSetup() {
-    // If Sync is configured for FxAccounts then we do that promise-dance.
-    if (this.weaveService.fxAccountsEnabled) {
-      return fxAccounts.getSignedInUser().then(user => {
-        // We want to treat "account needs verification" as "needs setup".
-        return !(user && user.verified);
-      });
-    }
-    // We are using legacy sync - check that.
     let firstSync = "";
     try {
       firstSync = Services.prefs.getCharPref("services.sync.firstSync");
@@ -119,19 +106,9 @@ var gSyncUI = {
   // to Sync needs to be verified, false otherwise.
   _needsVerification() {
     // For callers who care about the distinction between "needs setup" and
-    // "needs verification"
-    if (this.weaveService.fxAccountsEnabled) {
-      return fxAccounts.getSignedInUser().then(user => {
-        // If there is no user, they can't be in a "needs verification" state.
-        if (!user) {
-          return false;
-        }
-        return !user.verified;
-      });
-    }
-
-    // Otherwise we are configured for legacy Sync, which has no verification
-    // concept.
+    // "needs verification". Only for fxAccounts. XXX: remove this check.
+    // Since we are configured for legacy Sync only, which has no verification
+    // concept, just return false.
     return Promise.resolve(false);
   },
 
@@ -171,13 +148,7 @@ var gSyncUI = {
       document.getElementById("sync-setup-state").hidden = true;
       document.getElementById("sync-syncnow-state").hidden = true;
 
-#ifdef MOZ_SERVICES_CLOUDSYNC
-      if (CloudSync && CloudSync.ready && CloudSync().adapters.count) {
-        document.getElementById("sync-syncnow-state").hidden = false;
-      } else if (loginFailed) {
-#else
       if (loginFailed) {
-#endif
         // unhiding this element makes the menubar show the login failure state.
         document.getElementById("sync-reauth-state").hidden = false;
       } else if (needsSetup) {
diff --git a/base/content/sync/aboutSyncTabs.js b/base/content/sync/aboutSyncTabs.js
index f4bb607..08986f7 100644
--- a/base/content/sync/aboutSyncTabs.js
+++ b/base/content/sync/aboutSyncTabs.js
@@ -14,11 +14,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
 
-#ifdef MOZ_SERVICES_CLOUDSYNC
-XPCOMUtils.defineLazyModuleGetter(this, "CloudSync",
-                                  "resource://gre/modules/CloudSync.jsm");
-#endif
-
 var RemoteTabViewer = {
   _tabsList: null,
 
@@ -183,16 +178,7 @@ var RemoteTabViewer = {
       }
     }
 
-#ifdef MOZ_SERVICES_CLOUDSYNC
-    if (CloudSync && CloudSync.ready && CloudSync().tabsReady && CloudSync().tabs.hasRemoteTabs()) {
-      this._generateCloudSyncTabList()
-          .then(complete, complete);
-    } else {
-      complete();
-    }
-#else
     complete();
-#endif
   },
 
   _clearTabList: function () {
diff --git a/base/content/sync/utils.js b/base/content/sync/utils.js
index 92981f7..089c1f9 100644
--- a/base/content/sync/utils.js
+++ b/base/content/sync/utils.js
@@ -14,13 +14,6 @@ var gSyncUtils = {
     return this.bundle = Services.strings.createBundle("chrome://browser/locale/syncSetup.properties");
   },
 
-  get fxAccountsEnabled() {
-    let service = Components.classes["@mozilla.org/weave/service;1"]
-                            .getService(Components.interfaces.nsISupports)
-                            .wrappedJSObject;
-    return service.fxAccountsEnabled;
-  },
-
   // opens in a new window if we're in a modal prefwindow world, in a new tab otherwise
   _openLink: function (url) {
     let thisDocEl = document.documentElement,
@@ -78,8 +71,7 @@ var gSyncUtils = {
   },
 
   get tosURL() {
-    let root = this.fxAccountsEnabled ? "fxa." : "";
-    return  Weave.Svc.Prefs.get(root + "termsURL");
+     return  Weave.Svc.Prefs.get("termsURL");
   },
 
   openToS: function () {
@@ -87,8 +79,7 @@ var gSyncUtils = {
   },
 
   get privacyPolicyURL() {
-    let root = this.fxAccountsEnabled ? "fxa." : "";
-    return  Weave.Svc.Prefs.get(root + "privacyURL");
+     return  Weave.Svc.Prefs.get("privacyURL");
   },
 
   openPrivacyPolicy: function () {
diff --git a/components/preferences/in-content/sync.js b/components/preferences/in-content/sync.js
index 9333e74..87e8e5d 100644
--- a/components/preferences/in-content/sync.js
+++ b/components/preferences/in-content/sync.js
@@ -92,19 +92,7 @@ var gSyncPane = {
     } catch (e) {}
     if (!username) {
       this.page = FXA_PAGE_LOGGED_OUT;
-    } else if (xps.fxAccountsEnabled) {
-      // Use cached values while we wait for the up-to-date values
-      let cachedComputerName;
-      try {
-        cachedComputerName = Services.prefs.getCharPref("services.sync.client.name");
-      }
-      catch (e) {
-        cachedComputerName = "";
-      }
-      document.getElementById("fxaEmailAddress1").textContent = username;
-      this._populateComputerName(cachedComputerName);
-      this.page = FXA_PAGE_LOGGED_IN;
-    } else { // Old Sync
+     } else {
       this.page = PAGE_HAS_ACCOUNT;
     }
   },
@@ -381,17 +369,13 @@ var gSyncPane = {
                   .getService(Components.interfaces.nsISupports)
                   .wrappedJSObject;
 
-    if (service.fxAccountsEnabled) {
-      this._openAboutAccounts();
-    } else {
-      let win = Services.wm.getMostRecentWindow("Weave:AccountSetup");
-      if (win)
-        win.focus();
-      else {
-        window.openDialog("chrome://browser/content/sync/setup.xul",
-                          "weaveSetup", "centerscreen,chrome,resizable=no",
-                          wizardType);
-      }
+    let win = Services.wm.getMostRecentWindow("Weave:AccountSetup");
+    if (win)
+      win.focus();
+    else {
+      window.openDialog("chrome://browser/content/sync/setup.xul",
+                        "weaveSetup", "centerscreen,chrome,resizable=no",
+                        wizardType);
     }
   },