Bug 1275791 - Remove E10S_ADDONS_BLOCKER_RAN telemetry probe. r=chutten
authorFelipe Gomes <felipc@gmail.com>
Wed, 01 Jun 2016 15:46:21 -0300
changeset 341008 3e54b910e5a24d011c41cddb1b25f408bf1ea87f
parent 341007 9cef1a1fa8a2d158bcd53c946462dbb62f871ee9
child 341009 939833596ff85ad61859aec41a8ea543691bda89
push id1183
push userraliiev@mozilla.com
push dateMon, 05 Sep 2016 20:01:49 +0000
treeherdermozilla-release@3148731bed45 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschutten
bugs1275791
milestone49.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 1275791 - Remove E10S_ADDONS_BLOCKER_RAN telemetry probe. r=chutten MozReview-Commit-ID: CJfYXWqFnHJ
toolkit/components/telemetry/Histograms.json
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -8948,24 +8948,16 @@
     "kind": "boolean",
     "description": "Whether a browser window is set as an e10s window"
   },
   "E10S_BLOCKED_FROM_RUNNING": {
     "expires_in_version": "never",
     "kind": "boolean",
     "description": "Whether the e10s pref was set but it was blocked from running due to blacklisted conditions"
   },
-  "E10S_ADDONS_BLOCKER_RAN": {
-    "alert_emails": ["firefox-dev@mozilla.org"],
-    "expires_in_version": "49",
-    "kind": "flag",
-    "releaseChannelCollection": "opt-out",
-    "bug_numbers": [1248796],
-    "description": "Whether the code to block e10s for add-ons users was called"
-  },
   "BLOCKED_ON_PLUGIN_MODULE_INIT_MS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 20,
     "keyed": true,
     "description": "Time (ms) that the main thread has been blocked on LoadModule and NP_Initialize in PluginModuleParent"
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4888,19 +4888,16 @@ mozilla::BrowserTabsRemoteAutostart()
 
   gBrowserTabsRemoteStatus = status;
 
   mozilla::Telemetry::Accumulate(mozilla::Telemetry::E10S_STATUS, status);
   if (prefEnabled) {
     mozilla::Telemetry::Accumulate(mozilla::Telemetry::E10S_BLOCKED_FROM_RUNNING,
                                     !gBrowserTabsRemoteAutostart);
   }
-  if (Preferences::HasUserValue("extensions.e10sBlockedByAddons")) {
-    mozilla::Telemetry::Accumulate(mozilla::Telemetry::E10S_ADDONS_BLOCKER_RAN, true);
-  }
   return gBrowserTabsRemoteAutostart;
 }
 
 void
 SetupErrorHandling(const char* progname)
 {
 #ifdef XP_WIN
   /* On Windows XPSP3 and Windows Vista if DEP is configured off-by-default