Bug 1282587 - Remove telemetry probe expiring in Firefox 50. r?botond
MozReview-Commit-ID: IOBw3kRPNQY
--- a/dom/base/nsDocument.cpp
+++ b/dom/base/nsDocument.cpp
@@ -1574,18 +1574,16 @@ nsDocument::~nsDocument()
mixedContentLevel = MIXED_DISPLAY_AND_ACTIVE_CONTENT;
} else if (hasMixedActive){
mixedContentLevel = MIXED_ACTIVE_CONTENT;
} else if (hasMixedDisplay) {
mixedContentLevel = MIXED_DISPLAY_CONTENT;
}
Accumulate(Telemetry::MIXED_CONTENT_PAGE_LOAD, mixedContentLevel);
- Accumulate(Telemetry::SCROLL_LINKED_EFFECT_FOUND, mHasScrollLinkedEffect);
-
// record mixed object subrequest telemetry
if (mHasMixedContentObjectSubrequest) {
/* mixed object subrequest loaded on page*/
Accumulate(Telemetry::MIXED_CONTENT_OBJECT_SUBREQUEST, 1);
} else {
/* no mixed object subrequests loaded on page*/
Accumulate(Telemetry::MIXED_CONTENT_OBJECT_SUBREQUEST, 0);
}
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -10491,23 +10491,16 @@
"alert_emails": ["cpeterson@mozilla.com"],
"expires_in_version": "53",
"kind": "count",
"keyed": true,
"releaseChannelCollection": "opt-out",
"bug_numbers": [722110,1260065],
"description": "Counts number of times a certain plugin has been activated."
},
- "SCROLL_LINKED_EFFECT_FOUND": {
- "alert_emails": ["kgupta@mozilla.com"],
- "bug_numbers": [1229052],
- "expires_in_version": "50",
- "kind": "boolean",
- "description": "Attempt to determine prevalence of scroll-linked effects on the web."
- },
"SCROLL_INPUT_METHODS": {
"alert_emails": ["botond@mozilla.com"],
"bug_numbers": [1238137],
"expires_in_version": "50",
"kind": "enumerated",
"n_values": 64,
"description": "Count of scroll actions triggered by different input methods. See gfx/layers/apz/util/ScrollInputMethods.h for a list of possible values and their meanings."
},