Bug 1634615 - flip the pref to enable the rust browser.storage.sync implementation. r=lina,mixedpuppy

Differential Revision: https://phabricator.services.mozilla.com/D78171
This commit is contained in:
Mark Hammond 2020-06-04 06:11:45 +00:00
Родитель 7dcbad3c8a
Коммит 350c376c1a
4 изменённых файлов: 25 добавлений и 1 удалений

Просмотреть файл

@ -4512,7 +4512,7 @@ pref("webextensions.webRequest.requestBodyMaxRawBytes", 16777216);
pref("webextensions.storage.sync.enabled", true); pref("webextensions.storage.sync.enabled", true);
// Should we use the old kinto-based implementation of storage.sync? To be removed in bug 1637465. // Should we use the old kinto-based implementation of storage.sync? To be removed in bug 1637465.
pref("webextensions.storage.sync.kinto", true); pref("webextensions.storage.sync.kinto", false);
// Server used by the old kinto-based implementation of storage.sync. // Server used by the old kinto-based implementation of storage.sync.
pref("webextensions.storage.sync.serverURL", "https://webextensions.settings.services.mozilla.com/v1"); pref("webextensions.storage.sync.serverURL", "https://webextensions.settings.services.mozilla.com/v1");

Просмотреть файл

@ -3,6 +3,8 @@
"use strict"; "use strict";
Services.prefs.setBoolPref("webextensions.storage.sync.kinto", true);
const { const {
ExtensionStorageEngineKinto: ExtensionStorageEngine, ExtensionStorageEngineKinto: ExtensionStorageEngine,
} = ChromeUtils.import("resource://services-sync/engines/extension-storage.js"); } = ChromeUtils.import("resource://services-sync/engines/extension-storage.js");

Просмотреть файл

@ -3,6 +3,8 @@
"use strict"; "use strict";
Services.prefs.setBoolPref("webextensions.storage.sync.kinto", true);
const { ExtensionStorageEngine } = ChromeUtils.import( const { ExtensionStorageEngine } = ChromeUtils.import(
"resource://services-sync/engines/extension-storage.js" "resource://services-sync/engines/extension-storage.js"
); );

Просмотреть файл

@ -3,6 +3,26 @@
const { Service } = ChromeUtils.import("resource://services-sync/service.js"); const { Service } = ChromeUtils.import("resource://services-sync/service.js");
// This sucks, but this test fails if this engine is enabled, due to dumb
// things that aren't related to this engine. In short:
// * Because the addon manager isn't initialized, the addons engine fails to
// initialize. So we end up writing a meta/global with `extension-storage`
// but not addons.
// * After we sync, we discover 'addons' is locally enabled, but because it's
// not in m/g, we decide it's been remotely declined (and it decides this
// without even considering `declined`). So we disable 'addons'.
// * Disabling 'addons' means 'extension-storage' is disabled - but because
// that *is* in meta/global we re-update meta/global to remove it.
// * This test fails due to the extra, unexpected update of m/g.
//
// Another option would be to ensure the addons manager is initialized, but
// that's a larger patch and still isn't strictly relevant to what's being
// tested here, so...
Services.prefs.setBoolPref(
"services.sync.engine.extension-storage.force",
false
);
add_task(async function run_test() { add_task(async function run_test() {
enableValidationPrefs(); enableValidationPrefs();