diff options
| author | Moonchild <mcwerewolf@wolfbeast.com> | 2019-01-14 20:21:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-14 20:21:16 +0100 |
| commit | fb1d4c9712eb1898d89f90edfc6120ff169e6357 (patch) | |
| tree | 677d602abee695200146c4d51ba8db10146bc38c /docshell/base/nsDocShell.cpp | |
| parent | f38edc94a31de3bae839cf63ed57c3851908ac46 (diff) | |
| parent | 6335404642a019df481275f4f290ea76b4d8f597 (diff) | |
| download | UXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.tar UXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.tar.gz UXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.tar.lz UXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.tar.xz UXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.zip | |
Merge pull request #929 from adeshkp/remove-telemetry-stubs
Telemetry: Remove stubs and related code
Diffstat (limited to 'docshell/base/nsDocShell.cpp')
| -rw-r--r-- | docshell/base/nsDocShell.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index e6fa5a200..7f8a693cc 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -27,7 +27,6 @@ #include "mozilla/Preferences.h" #include "mozilla/Services.h" #include "mozilla/StartupTimeline.h" -#include "mozilla/Telemetry.h" #include "mozilla/Unused.h" #include "Navigator.h" #include "URIUtils.h" @@ -194,7 +193,6 @@ #include "nsSandboxFlags.h" #include "nsXULAppAPI.h" #include "nsDOMNavigationTiming.h" -#include "nsISecurityUITelemetry.h" #include "nsIAppsService.h" #include "nsDSURIContentListener.h" #include "nsDocShellLoadTypes.h" @@ -4985,15 +4983,6 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI, cssClass.AssignLiteral("badStsCert"); } - uint32_t bucketId; - if (isStsHost) { - // measuring STS separately allows us to measure click through - // rates easily - bucketId = nsISecurityUITelemetry::WARNING_BAD_CERT_TOP_STS; - } else { - bucketId = nsISecurityUITelemetry::WARNING_BAD_CERT_TOP; - } - // See if an alternate cert error page is registered nsAdoptingCString alternateErrorPage = Preferences::GetCString("security.alternate_certificate_error_page"); @@ -5021,23 +5010,12 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI, errorPage.Assign(alternateErrorPage); } - uint32_t bucketId; - bool sendTelemetry = false; if (NS_ERROR_PHISHING_URI == aError) { - sendTelemetry = true; error.AssignLiteral("deceptiveBlocked"); - bucketId = IsFrame() ? nsISecurityUITelemetry::WARNING_PHISHING_PAGE_FRAME - : nsISecurityUITelemetry::WARNING_PHISHING_PAGE_TOP; } else if (NS_ERROR_MALWARE_URI == aError) { - sendTelemetry = true; error.AssignLiteral("malwareBlocked"); - bucketId = IsFrame() ? nsISecurityUITelemetry::WARNING_MALWARE_PAGE_FRAME - : nsISecurityUITelemetry::WARNING_MALWARE_PAGE_TOP; } else if (NS_ERROR_UNWANTED_URI == aError) { - sendTelemetry = true; error.AssignLiteral("unwantedBlocked"); - bucketId = IsFrame() ? nsISecurityUITelemetry::WARNING_UNWANTED_PAGE_FRAME - : nsISecurityUITelemetry::WARNING_UNWANTED_PAGE_TOP; } cssClass.AssignLiteral("blacklist"); |