Bug 1385127 - Enable bookmark validation on early Beta. r=markh
authorKit Cambridge <kit@yakshaving.ninja>
Thu, 27 Jul 2017 16:07:14 -0700
changeset 420253 ff43f98ed0d67bf0b5816ad6d68fb95ff90c5288
parent 420252 6d372311a32e5cb4dc24f93cdac71dc1cd2ae9b2
child 420254 d6e31d250e17daefdeae7761dede122ad991aa1d
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarkh
bugs1385127
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1385127 - Enable bookmark validation on early Beta. r=markh MozReview-Commit-ID: h1ps0YebkW
services/sync/services-sync.js
--- a/services/sync/services-sync.js
+++ b/services/sync/services-sync.js
@@ -77,20 +77,25 @@ pref("services.sync.log.logger.identity"
 pref("services.sync.log.cryptoDebug", false);
 
 pref("services.sync.fxa.termsURL", "https://accounts.firefox.com/legal/terms");
 pref("services.sync.fxa.privacyURL", "https://accounts.firefox.com/legal/privacy");
 
 pref("services.sync.telemetry.submissionInterval", 43200); // 12 hours in seconds
 pref("services.sync.telemetry.maxPayloadCount", 500);
 
-#ifndef RELEASE_OR_BETA
-// Enable the (fairly costly) client/server validation on nightly/aurora only.
+#ifdef EARLY_BETA_OR_EARLIER
+// Enable the (fairly costly) client/server validation through early Beta, but
+// not release candidates or Release.
 pref("services.sync.engine.bookmarks.validation.enabled", true);
-// Enable repair of bookmarks - requires validation also be enabled.
+#endif
+
+#if defined(NIGHTLY_BUILD)
+// Enable repair of bookmarks on Nightly only - requires validation also be
+// enabled.
 pref("services.sync.engine.bookmarks.repair.enabled", true);
 #endif
 
 // We consider validation this frequently. After considering validation, even
 // if we don't end up validating, we won't try again unless this much time has passed.
 pref("services.sync.engine.bookmarks.validation.interval", 86400); // 24 hours in seconds
 
 // We only run validation `services.sync.validation.percentageChance` percent of