Bug 1614966 disable remote settings in webext xpcom r=Ehsan

Move a prior fix from bug 1582053 into the test ini files.  This allows other tests that use the test utils to also rely on remote settings working properly.

Differential Revision: https://phabricator.services.mozilla.com/D62810

--HG--
extra : moz-landing-system : lando

toolkit/components/extensions/ExtensionXPCShellUtils.jsm

@@ -905,19 +905,6 @@ var ExtensionTestUtils = {
         )
       );
     });
-
-    Services.prefs.setStringPref(
-      "services.settings.server",
-      "http://localhost:7777/remote-settings-dummy/v1"
-    );
-    // Make sure that loading the default settings for url-classifier-skip-urls
-    // doesn't interfere with running our tests while IDB operations are in
-    // flight by overriding the default remote settings bucket pref name to
-    // ensure that the IDB database isn't created in the first place.
-    Services.prefs.setStringPref(
-      "services.settings.default_bucket",
-      "nonexistent-bucket-foo"
-    );
   },
 
   addonManagerStarted: false,

toolkit/components/extensions/test/xpcshell/xpcshell-e10s.ini

@@ -9,4 +9,13 @@ support-files =
   xpcshell-content.ini
 tags = webextensions webextensions-e10s
 
+# services.settings.server/default_bucket:
+# Make sure that loading the default settings for url-classifier-skip-urls
+# doesn't interfere with running our tests while IDB operations are in
+# flight by overriding the default remote settings bucket pref name to
+# ensure that the IDB database isn't created in the first place.
+prefs =
+  services.settings.server=http://localhost:7777/remote-settings-dummy/v1
+  services.settings.default_bucket=nonexistent-bucket-foo
+
 [include:xpcshell-content.ini]

toolkit/components/extensions/test/xpcshell/xpcshell-remote.ini

@@ -9,6 +9,15 @@ support-files =
   xpcshell-content.ini
 tags = webextensions remote-webextensions
 
+# services.settings.server/default_bucket:
+# Make sure that loading the default settings for url-classifier-skip-urls
+# doesn't interfere with running our tests while IDB operations are in
+# flight by overriding the default remote settings bucket pref name to
+# ensure that the IDB database isn't created in the first place.
+prefs =
+  services.settings.server=http://localhost:7777/remote-settings-dummy/v1
+  services.settings.default_bucket=nonexistent-bucket-foo
+
 [include:xpcshell-common.ini]
 [include:xpcshell-content.ini]
 

toolkit/components/extensions/test/xpcshell/xpcshell.ini

@@ -8,6 +8,15 @@ support-files =
   xpcshell-content.ini
 tags = webextensions in-process-webextensions
 
+# services.settings.server/default_bucket:
+# Make sure that loading the default settings for url-classifier-skip-urls
+# doesn't interfere with running our tests while IDB operations are in
+# flight by overriding the default remote settings bucket pref name to
+# ensure that the IDB database isn't created in the first place.
+prefs =
+  services.settings.server=http://localhost:7777/remote-settings-dummy/v1
+  services.settings.default_bucket=nonexistent-bucket-foo
+
 # This file contains tests which are not affected by multi-process
 # configuration, or do not support out-of-process content or extensions
 # for one reason or another.