--- a/testing/profiles/reftest/user.js
+++ b/testing/profiles/reftest/user.js
@@ -1,156 +1,141 @@
+// Preference file for the reftest harness.
+/* globals user_pref */
+// Make sure Shield doesn't hit the network.
+user_pref("app.normandy.api_url", "https://localhost/selfsupport-dummy/");
+// Disable updates
+user_pref("app.update.enabled", false);
+user_pref("app.update.staging.enabled", false);
+user_pref("app.update.url.android", "");
+user_pref("browser.dom.window.dump.enabled", true);
+// Make sure we don't reach out to the network for activity stream services
+user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
+user_pref("browser.newtabpage.activity-stream.feeds.snippets", false);
+user_pref("browser.newtabpage.activity-stream.tippyTop.service.endpoint", "");
+// Disable the thumbnailing service
+user_pref("browser.pagethumbnails.capturing_disabled", true);
+user_pref("browser.ping-centre.production.endpoint", "https://localhost");
+// Make sure Ping Centre doesn't hit the network.
+user_pref("browser.ping-centre.staging.endpoint", "https://localhost");
+user_pref("browser.safebrowsing.blockedURIs.enabled", false);
+user_pref("browser.safebrowsing.downloads.enabled", false);
+user_pref("browser.safebrowsing.downloads.remote.url", "http://127.0.0.1/safebrowsing-dummy/gethash");
+user_pref("browser.safebrowsing.malware.enabled", false);
+user_pref("browser.safebrowsing.passwords.enabled", false);
+// Likewise for safebrowsing.
+user_pref("browser.safebrowsing.phishing.enabled", false);
+user_pref("browser.safebrowsing.provider.google.gethashURL", "http://127.0.0.1/safebrowsing-dummyg/gethash");
+user_pref("browser.safebrowsing.provider.google.updateURL", "http://127.0.0.1/safebrowsing-dummyg/update");
+user_pref("browser.safebrowsing.provider.google4.gethashURL", "http://127.0.0.1/safebrowsing-dummyg4/gethash");
+user_pref("browser.safebrowsing.provider.google4.updateURL", "http://127.0.0.1/safebrowsing-dummyg4/update");
+user_pref("browser.safebrowsing.provider.mozilla.gethashURL", "http://127.0.0.1/safebrowsing-dummym/gethash");
+user_pref("browser.safebrowsing.provider.mozilla.updateURL", "http://127.0.0.1/safebrowsing-dummym/update");
+user_pref("browser.search.countryCode", "US");
+user_pref("browser.search.geoSpecificDefaults", false);
+// Tell the search service we are running in the US.  This also has the
+// desired side-effect of preventing our geoip lookup.
+user_pref("browser.search.isUS", true);
+// And for snippets.
+user_pref("browser.snippets.enabled", false);
+user_pref("browser.snippets.firstrunHomepage.enabled", false);
+user_pref("browser.snippets.syncPromo.enabled", false);
+// use about:blank, not browser.startup.homepage
+user_pref("browser.startup.page", 0);
+// Since our tests are 800px wide, set the assume-designed-for width of all
+// pages to be 800px (instead of the default of 980px). This ensures that
+// in our 800px window we don't zoom out by default to try to fit the
+// assumed 980px content.
+user_pref("browser.viewport.desktopWidth", 800);
+// And for webapp updates.  Yes, it is supposed to be an integer.
+user_pref("browser.webapps.checkForUpdates", 0);
+user_pref("datareporting.healthreport.uploadEnabled", false);
+// Skip data reporting policy notifications.
+user_pref("datareporting.policy.dataSubmissionPolicyBypassNotification", true);
+// Allow XUL and XBL files to be opened from file:// URIs
+user_pref("dom.allow_XUL_XBL_for_file", true);
+// Don't forcibly kill content processes after a timeout
+user_pref("dom.ipc.tabs.shutdownTimeoutSecs", 0);
+user_pref("dom.max_chrome_script_run_time", 0);
+// no slow script dialogs
+user_pref("dom.max_script_run_time", 0);
+user_pref("dom.send_after_paint_to_content", true);
 // For mochitests, we're more interested in testing the behavior of in-
 // content XBL bindings, so we set this pref to true. In reftests, we're
 // more interested in testing the behavior of XBL as it works in chrome,
 // so we want this pref to be false.
 user_pref("dom.use_xbl_scopes_for_remote_xul", false);
-user_pref("gfx.color_management.mode", 2);
-user_pref("gfx.color_management.force_srgb", true);
-user_pref("gfx.logging.level", 1);
-user_pref("browser.dom.window.dump.enabled", true);
-user_pref("ui.caretBlinkTime", -1);
-user_pref("ui.caretWidth", 1);
-user_pref("dom.send_after_paint_to_content", true);
-// no slow script dialogs
-user_pref("dom.max_script_run_time", 0);
-user_pref("dom.max_chrome_script_run_time", 0);
-user_pref("hangmonitor.timeout", 0);
-// Ensure autoplay is enabled for all platforms.
-user_pref("media.autoplay.enabled", true);
-// Disable updates
-user_pref("app.update.enabled", false);
-user_pref("app.update.staging.enabled", false);
-user_pref("app.update.url.android", "");
+user_pref("extensions.autoDisableScopes", 0);
+// Disable blocklist updates so we don't have them reported as leaks
+user_pref("extensions.blocklist.enabled", false);
+// Only allow add-ons from the profile and app and allow foreign
+// injection
+user_pref("extensions.enabledScopes", 5);
+user_pref("extensions.getAddons.cache.enabled", false);
 // Ensure we can load the reftest extension
 user_pref("extensions.legacy.enabled", true);
-user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true);
+user_pref("extensions.systemAddon.update.url", "http://localhost/dummy-system-addons.xml");
 // Disable addon updates and prefetching so we don't leak them
 user_pref("extensions.update.enabled", false);
-user_pref("extensions.systemAddon.update.url", "http://localhost/dummy-system-addons.xml");
-user_pref("extensions.getAddons.cache.enabled", false);
-// Disable blocklist updates so we don't have them reported as leaks
-user_pref("extensions.blocklist.enabled", false);
+// And for useragent updates.
+user_pref("general.useragent.updates.enabled", false);
+user_pref("gfx.color_management.force_srgb", true);
+user_pref("gfx.color_management.mode", 2);
+user_pref("gfx.logging.level", 1);
+user_pref("hangmonitor.timeout", 0);
 // Disable downscale-during-decode, since it makes reftests more difficult.
 user_pref("image.downscale-during-decode.enabled", false);
-// Checking whether two files are the same is slow on Windows.
-// Setting this pref makes tests run much faster there. Reftests also
-// rely on this to load downloadable fonts (which are restricted to same
-// origin policy by default) from outside their directory.
-user_pref("security.fileuri.strict_origin_policy", false);
-// Disable the thumbnailing service
-user_pref("browser.pagethumbnails.capturing_disabled", true);
-// Since our tests are 800px wide, set the assume-designed-for width of all
-// pages to be 800px (instead of the default of 980px). This ensures that
-// in our 800px window we don't zoom out by default to try to fit the
-// assumed 980px content.
-user_pref("browser.viewport.desktopWidth", 800);
-// Disable the fade out (over time) of overlay scrollbars, since we
-// can't guarantee taking both reftest snapshots at the same point
-// during the fade.
-user_pref("layout.testing.overlay-scrollbars.always-visible", true);
 // Disable interruptible reflow since (1) it's normally not going to
 // happen, but (2) it might happen if we somehow end up with both
 // pending user events and clock skew.  So to avoid having to change
 // MakeProgress to deal with waiting for interruptible reflows to
 // complete for a rare edge case, we just disable interruptible
 // reflow so that that rare edge case doesn't lead to reftest
 // failures.
 user_pref("layout.interruptible-reflow.enabled", false);
-
-// Tell the search service we are running in the US.  This also has the
-// desired side-effect of preventing our geoip lookup.
-user_pref("browser.search.isUS", true);
-user_pref("browser.search.countryCode", "US");
-user_pref("browser.search.geoSpecificDefaults", false);
-
-// Make sure Shield doesn't hit the network.
-user_pref("app.normandy.api_url", "https://localhost/selfsupport-dummy/");
-
-// Make sure Ping Centre doesn't hit the network.
-user_pref("browser.ping-centre.staging.endpoint", "https://localhost");
-user_pref("browser.ping-centre.production.endpoint", "https://localhost");
-
-// use about:blank, not browser.startup.homepage
-user_pref("browser.startup.page", 0);
-
-// Allow XUL and XBL files to be opened from file:// URIs
-user_pref("dom.allow_XUL_XBL_for_file", true);
-
+// Disable the fade out (over time) of overlay scrollbars, since we
+// can't guarantee taking both reftest snapshots at the same point
+// during the fade.
+user_pref("layout.testing.overlay-scrollbars.always-visible", true);
+// Disable all recommended Marionette preferences for Gecko tests.
+// The prefs recommended by Marionette are typically geared towards
+// consumer automation; not vendor testing.
+user_pref("marionette.prefs.recommended", false);
+// Ensure autoplay is enabled for all platforms.
+user_pref("media.autoplay.enabled", true);
+user_pref("media.gmp-manager.updateEnabled", false);
+user_pref("media.gmp-manager.url.override", "http://localhost/dummy-gmp-manager.xml");
+user_pref("media.openUnsupportedTypeWithExternalApp", false);
+// Reftests load a lot of URLs very quickly. This puts avoidable and
+// unnecessary I/O pressure on the Places DB (measured to be in the
+// gigabytes).
+user_pref("places.history.enabled", false);
+// For Firefox 52 only, ESR will support non-Flash plugins while release will
+// not, so we keep testing the non-Flash pathways
+user_pref("plugin.load_flash_only", false);
+// Likewise for lists served from the Mozilla server.
+user_pref("plugins.flashBlock.enabled", false);
+user_pref("plugins.show_infobar", false);
+user_pref("privacy.trackingprotection.annotate_channels", false);
+user_pref("privacy.trackingprotection.enabled", false);
+user_pref("privacy.trackingprotection.pbmode.enabled", false);
+// Checking whether two files are the same is slow on Windows.
+// Setting this pref makes tests run much faster there. Reftests also
+// rely on this to load downloadable fonts (which are restricted to same
+// origin policy by default) from outside their directory.
+user_pref("security.fileuri.strict_origin_policy", false);
+user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true);
 // Allow view-source URIs to be opened from URIs that share
 // their protocol with the inner URI of the view-source URI
 user_pref("security.view-source.reachable-from-inner-protocol", true);
-
-// Skip data reporting policy notifications.
-user_pref("datareporting.policy.dataSubmissionPolicyBypassNotification", true);
-
+user_pref("startup.homepage_override_url", "");
+user_pref("startup.homepage_welcome_url", "");
+user_pref("startup.homepage_welcome_url.additional", "");
+// A fake bool pref for "@supports -moz-bool-pref" sanify test.
+user_pref("testing.supports.moz-bool-pref", false);
 // Ensure that telemetry is disabled, so we don't connect to the telemetry
 // server in the middle of the tests.
 user_pref("toolkit.telemetry.enabled", false);
 user_pref("toolkit.telemetry.server", "https://%(server)s/telemetry-dummy/");
-user_pref("datareporting.healthreport.uploadEnabled", false);
-// Likewise for safebrowsing.
-user_pref("browser.safebrowsing.phishing.enabled", false);
-user_pref("browser.safebrowsing.malware.enabled", false);
-user_pref("browser.safebrowsing.blockedURIs.enabled", false);
-user_pref("browser.safebrowsing.passwords.enabled", false);
-user_pref("browser.safebrowsing.downloads.enabled", false);
-user_pref("plugins.show_infobar", false);
-user_pref("browser.safebrowsing.downloads.remote.url", "http://127.0.0.1/safebrowsing-dummy/gethash");
-user_pref("browser.safebrowsing.provider.google.gethashURL", "http://127.0.0.1/safebrowsing-dummyg/gethash");
-user_pref("browser.safebrowsing.provider.google.updateURL", "http://127.0.0.1/safebrowsing-dummyg/update");
-user_pref("browser.safebrowsing.provider.google4.gethashURL", "http://127.0.0.1/safebrowsing-dummyg4/gethash");
-user_pref("browser.safebrowsing.provider.google4.updateURL", "http://127.0.0.1/safebrowsing-dummyg4/update");
-// Likewise for lists served from the Mozilla server.
-user_pref("plugins.flashBlock.enabled", false);
-user_pref("privacy.trackingprotection.annotate_channels", false);
-user_pref("privacy.trackingprotection.enabled", false);
-user_pref("privacy.trackingprotection.pbmode.enabled", false);
-user_pref("browser.safebrowsing.provider.mozilla.gethashURL", "http://127.0.0.1/safebrowsing-dummym/gethash");
-user_pref("browser.safebrowsing.provider.mozilla.updateURL", "http://127.0.0.1/safebrowsing-dummym/update");
-// And for snippets.
-user_pref("browser.snippets.enabled", false);
-user_pref("browser.snippets.syncPromo.enabled", false);
-user_pref("browser.snippets.firstrunHomepage.enabled", false);
-// And for useragent updates.
-user_pref("general.useragent.updates.enabled", false);
-// And for webapp updates.  Yes, it is supposed to be an integer.
-user_pref("browser.webapps.checkForUpdates", 0);
-// Only allow add-ons from the profile and app and allow foreign
-// injection
-user_pref("extensions.enabledScopes", 5);
-user_pref("extensions.autoDisableScopes", 0);
+user_pref("ui.caretBlinkTime", -1);
+user_pref("ui.caretWidth", 1);
 // Allow unsigned add-ons
 user_pref("xpinstall.signatures.required", false);
-
-user_pref("startup.homepage_welcome_url", "");
-user_pref("startup.homepage_welcome_url.additional", "");
-user_pref("startup.homepage_override_url", "");
-
-user_pref("media.gmp-manager.url.override", "http://localhost/dummy-gmp-manager.xml");
-user_pref("media.gmp-manager.updateEnabled", false);
-
-// A fake bool pref for "@supports -moz-bool-pref" sanify test.
-user_pref("testing.supports.moz-bool-pref", false);
-
-// Reftests load a lot of URLs very quickly. This puts avoidable and
-// unnecessary I/O pressure on the Places DB (measured to be in the
-// gigabytes).
-user_pref("places.history.enabled", false);
-
-// For Firefox 52 only, ESR will support non-Flash plugins while release will
-// not, so we keep testing the non-Flash pathways
-user_pref("plugin.load_flash_only", false);
-
-user_pref("media.openUnsupportedTypeWithExternalApp", false);
-
-// Disable all recommended Marionette preferences for Gecko tests.
-// The prefs recommended by Marionette are typically geared towards
-// consumer automation; not vendor testing.
-user_pref("marionette.prefs.recommended", false);
-
-// Make sure we don't reach out to the network for activity stream services
-user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
-user_pref("browser.newtabpage.activity-stream.feeds.snippets", false);
-user_pref("browser.newtabpage.activity-stream.tippyTop.service.endpoint", "");
-
-// Don't forcibly kill content processes after a timeout
-user_pref("dom.ipc.tabs.shutdownTimeoutSecs", 0);