From 2d3b7717ae8ddfa5e6561cff5d6daa7f80a939e5 Mon Sep 17 00:00:00 2001
From: Ascrod <32915892+Ascrod@users.noreply.github.com>
Date: Mon, 8 Apr 2019 21:06:29 -0400
Subject: Issue #991 Part 6: Services

---
 services/sync/modules/status.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'services/sync/modules')

diff --git a/services/sync/modules/status.js b/services/sync/modules/status.js
index a5b8305b4..1233cbe14 100644
--- a/services/sync/modules/status.js
+++ b/services/sync/modules/status.js
@@ -125,12 +125,7 @@ this.Status = {
   resetSync: function resetSync() {
     // Logger setup.
     let logPref = PREFS_BRANCH + "log.logger.status";
-    let logLevel = "Trace";
-    try {
-      logLevel = Services.prefs.getCharPref(logPref);
-    } catch (ex) {
-      // Use default.
-    }
+    let logLevel = Services.prefs.getCharPref(logPref, "Trace");
     this._log.level = Log.Level[logLevel];
 
     this._log.info("Resetting Status.");
-- 
cgit v1.2.3


From de75f133a7ec654d2a7c5bf628b3aee9fc109730 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Fri, 19 Apr 2019 02:02:56 +0200
Subject: Remove Firefox Accounts service and tie-ins.

See previous commit for removal of browser identity module.
---
 services/sync/modules/util.js | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

(limited to 'services/sync/modules')

diff --git a/services/sync/modules/util.js b/services/sync/modules/util.js
index 12496d23a..7fd5a7971 100644
--- a/services/sync/modules/util.js
+++ b/services/sync/modules/util.js
@@ -19,13 +19,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 Cu.import("resource://gre/modules/osfile.jsm", this);
 Cu.import("resource://gre/modules/Task.jsm", this);
 
-// FxAccountsCommon.js doesn't use a "namespace", so create one here.
-XPCOMUtils.defineLazyGetter(this, "FxAccountsCommon", function() {
-  let FxAccountsCommon = {};
-  Cu.import("resource://gre/modules/FxAccountsCommon.js", FxAccountsCommon);
-  return FxAccountsCommon;
-});
-
 /*
  * Utility functions
  */
@@ -599,9 +592,6 @@ this.Utils = {
    */
   getSyncCredentialsHosts: function() {
     let result = new Set(this.getSyncCredentialsHostsLegacy());
-    for (let host of this.getSyncCredentialsHostsFxA()) {
-      result.add(host);
-    }
     return result;
   },
 
@@ -613,36 +603,6 @@ this.Utils = {
     return new Set([PWDMGR_HOST]);
   },
 
-  /*
-   * Get the FxA identity hosts.
-   */
-  getSyncCredentialsHostsFxA: function() {
-    // This is somewhat expensive and the result static, so we cache the result.
-    if (this._syncCredentialsHostsFxA) {
-      return this._syncCredentialsHostsFxA;
-    }
-    let result = new Set();
-    // the FxA host
-    result.add(FxAccountsCommon.FXA_PWDMGR_HOST);
-    //
-    // The FxA hosts - these almost certainly all have the same hostname, but
-    // better safe than sorry...
-    for (let prefName of ["identity.fxaccounts.remote.force_auth.uri",
-                          "identity.fxaccounts.remote.signup.uri",
-                          "identity.fxaccounts.remote.signin.uri",
-                          "identity.fxaccounts.settings.uri"]) {
-      let prefVal;
-      try {
-        prefVal = Services.prefs.getCharPref(prefName);
-      } catch (_) {
-        continue;
-      }
-      let uri = Services.io.newURI(prefVal, null, null);
-      result.add(uri.prePath);
-    }
-    return this._syncCredentialsHostsFxA = result;
-  },
-
   getDefaultDeviceName() {
     // Generate a client name if we don't have a useful one yet
     let env = Cc["@mozilla.org/process/environment;1"]
-- 
cgit v1.2.3


From a53ab3f345be0f707aa0e9ef359f2728b519c930 Mon Sep 17 00:00:00 2001
From: Sean Greenslade <sean@seangreenslade.com>
Date: Sat, 11 May 2019 18:12:11 -0700
Subject: Update sync clear history function to use new clear() API call.

---
 services/sync/modules/engines/history.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'services/sync/modules')

diff --git a/services/sync/modules/engines/history.js b/services/sync/modules/engines/history.js
index e7f53766f..705b6a119 100644
--- a/services/sync/modules/engines/history.js
+++ b/services/sync/modules/engines/history.js
@@ -346,7 +346,7 @@ HistoryStore.prototype = {
   },
 
   wipe: function HistStore_wipe() {
-    PlacesUtils.history.removeAllPages();
+    PlacesUtils.history.clear();
   }
 };
 
-- 
cgit v1.2.3