Followup to Bug 1196890 to fix broken xpcshell tests a=test-only
authorWes Kocher <wkocher@mozilla.com>
Fri, 04 Sep 2015 15:04:43 -0700
changeset 289139 091859006f2bd75b471f95ef423c02e2094d22b9
parent 289138 d5686c4eb3e5eef0c6e5ac43519b00944f136386
child 289140 4d808743d8608c39a8ff47054abbcfd9c8bd5857
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstest-only
bugs1196890
milestone42.0a2
Followup to Bug 1196890 to fix broken xpcshell tests a=test-only
toolkit/components/telemetry/TelemetryEnvironment.jsm
--- a/toolkit/components/telemetry/TelemetryEnvironment.jsm
+++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm
@@ -108,18 +108,18 @@ const DEFAULT_ENVIRONMENT_PREFS = new Ma
   ["browser.urlbar.unifiedcomplete", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["browser.urlbar.userMadeSearchSuggestionsChoice", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["devtools.chrome.enabled", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["devtools.debugger.enabled", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["devtools.debugger.remote-enabled", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["dom.ipc.plugins.asyncInit", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["dom.ipc.plugins.enabled", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["experiments.manifest.uri", TelemetryEnvironment.RECORD_PREF_VALUE],
-  ["extensions.autoDisableScopes", {what: RECORD_PREF_VALUE}],
-  ["extensions.enabledScopes", {what: RECORD_PREF_VALUE}],
+  ["extensions.autoDisableScopes", TelemetryEnvironment.RECORD_PREF_VALUE],
+  ["extensions.enabledScopes", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["extensions.blocklist.enabled", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["extensions.blocklist.url", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["extensions.strictCompatibility", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["extensions.update.enabled", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["extensions.update.url", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["extensions.update.background.url", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["general.smoothScroll", TelemetryEnvironment.RECORD_PREF_VALUE],
   ["gfx.direct2d.disabled", TelemetryEnvironment.RECORD_PREF_VALUE],