diff --git a/services/sync/modules/bookmark_validator.js b/services/sync/modules/bookmark_validator.js index f6af36245484..e72a2ae41f7e 100644 --- a/services/sync/modules/bookmark_validator.js +++ b/services/sync/modules/bookmark_validator.js @@ -41,8 +41,6 @@ this.EXPORTED_SYMBOLS = ["BookmarkValidator", "BookmarkProblemData"]; * - parentNotFolder (array of ids): list of records that have parents that * aren't folders * - rootOnServer (boolean): true if the root came from the server - * - badClientRoots (array of ids): Contains any client-side root ids where - * the root is missing or isn't a (direct) child of the places root. * * - clientMissing: Array of ids on the server missing from the client * - serverMissing: Array of ids on the client missing from the server @@ -72,7 +70,6 @@ class BookmarkProblemData { this.duplicateChildren = []; this.parentNotFolder = []; - this.badClientRoots = []; this.clientMissing = []; this.serverMissing = []; this.serverDeleted = []; @@ -125,7 +122,6 @@ class BookmarkProblemData { { name: "parentChildMismatches", count: this.parentChildMismatches.length }, { name: "cycles", count: this.cycles.length }, { name: "clientCycles", count: this.clientCycles.length }, - { name: "badClientRoots", count: this.badClientRoots.length }, { name: "orphans", count: this.orphans.length }, { name: "missingChildren", count: this.missingChildren.length }, { name: "deletedChildren", count: this.deletedChildren.length }, @@ -562,24 +558,6 @@ class BookmarkValidator { return cycles; } - // Perform client-side sanity checking that doesn't involve server data - _validateClient(problemData, clientRecords) { - problemData.clientCycles = this._detectCycles(clientRecords); - const rootsToCheck = [ - PlacesUtils.bookmarks.menuGuid, - PlacesUtils.bookmarks.toolbarGuid, - PlacesUtils.bookmarks.unfiledGuid, - PlacesUtils.bookmarks.mobileGuid, - ]; - for (let rootGUID of rootsToCheck) { - let record = clientRecords.find(record => - record.guid === rootGUID); - if (!record || record.parentid !== "places") { - problemData.badClientRoots.push(rootGUID); - } - } - } - /** * Compare the list of server records with the client tree. * @@ -600,7 +578,7 @@ class BookmarkValidator { serverRecords = inspectionInfo.records; let problemData = inspectionInfo.problemData; - this._validateClient(problemData, clientRecords); + problemData.clientCycles = this._detectCycles(clientRecords); let matches = [];