Backed out 4 changesets (bug 1879154) for causing bustage on nsUserCh…

…aracteristics.cpp. CLOSED TREE

Backed out changeset 499cae53f42d (bug 1879154)
Backed out changeset fdc6b48b7944 (bug 1879154)
Backed out changeset 2750454a061c (bug 1879154)
Backed out changeset 9890a85aacdd (bug 1879154)

modules/libpref/init/all.js

@@ -621,19 +621,6 @@ pref("toolkit.telemetry.dap_helper", "https://dap.services.mozilla.com");
 pref("toolkit.telemetry.dap_helper_owner", "Mozilla");
 pref("toolkit.telemetry.dap.logLevel", "Warn");
 
-// pref for mozilla to induce a new ping from users. This value should only ever be increased
-// and doing so will induce a new data ping from all users, so be careful. Mozilla may edit
-// this pref via our remote update/experimentation system
-pref("toolkit.telemetry.user_characteristics_ping.current_version", 0);
-// pref containing the value for the user of the last version of the ping we sent
-// if a user wants to disable this type of ping explicitly, set this to -1
-// firefox/mozilla will not modify this value if a negative number is present.
-pref("toolkit.telemetry.user_characteristics_ping.last_version_sent", 0);
-// A unique identifier for the user characteristics ping. This is not the same as
-// the telemetry client id (which is not sent in this ping), it is cleared when a
-// user opts-out of telemetry, it is set upon first telemetry submission
-pref("toolkit.telemetry.user_characteristics_ping.uuid", "");
-
 // AsyncShutdown delay before crashing in case of shutdown freeze
 // ASan, TSan and code coverage builds can be considerably slower. Extend the
 // grace period for both the asyncshutdown and the terminator.

toolkit/components/glean/metrics_index.py

@@ -124,7 +124,6 @@
     "browser/components/search/pings.yaml",
     "browser/components/urlbar/pings.yaml",
     "toolkit/components/crashes/pings.yaml",
-    "toolkit/components/resistfingerprinting/pings.yaml",
     "toolkit/components/telemetry/pings.yaml",
     "toolkit/modules/pings.yaml",
 ]

toolkit/components/resistfingerprinting/metrics.yaml

@@ -25,48 +25,3 @@ fingerprinting.protection:
       - [email protected]
     expires: never
     telemetry_mirror: FINGERPRINTING_PROTECTION_CANVAS_NOISE_CALCULATE_TIME_MS
-
-
-characteristics:
-  client_identifier:
-    type: uuid
-    description: >
-      A unique identifier for a user, not the same as the normal Telemetry
-      client_id, but needed so we can deduplicate reports and only take the most
-      recent one per user.
-    lifetime: application
-    send_in_pings:
-      - user-characteristics
-      - deletion-request
-    notification_emails:
-      - [email protected]
-    bugs:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1879154
-    data_reviews:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1879154#c8
-    expires: never
-    data_sensitivity:
-      - technical
-
-  submission_schema:
-    type: quantity
-    unit: versions
-    description: >
-      An incrementing constant that represents the current schema/source of the
-      data present in a ping. By referring to this value in a ping, one can know
-      for certain the provenance of other data present in the ping, and what
-      data may or may not be present.
-    lifetime: application
-    send_in_pings:
-      - user-characteristics
-    notification_emails:
-      - [email protected]
-    bugs:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1879154
-    data_reviews:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1879154#c8
-    expires: never
-    data_sensitivity:
-      - technical

toolkit/components/resistfingerprinting/moz.build

@@ -11,7 +11,6 @@ TEST_DIRS += ["tests"]
 
 UNIFIED_SOURCES += [
     "nsRFPService.cpp",
-    "nsUserCharacteristics.cpp",
     "RelativeTimeline.cpp",
 ]
 
@@ -24,7 +23,6 @@ EXPORTS.mozilla += [
     "RelativeTimeline.h",
     "RFPTargetIPCUtils.h",
 ]
-EXPORTS.mozilla.gtest += ["nsUserCharacteristics.h"]
 
 EXTRA_JS_MODULES += [
     "FingerprintingWebCompatService.sys.mjs",

toolkit/components/resistfingerprinting/nsRFPService.cpp

@@ -71,7 +71,6 @@
 #include "nsTLiteralString.h"
 #include "nsTPromiseFlatString.h"
 #include "nsTStringRepr.h"
-#include "nsUserCharacteristics.h"
 #include "nsXPCOM.h"
 
 #include "nsICookieJarSettings.h"
@@ -101,13 +100,8 @@ static mozilla::LazyLogModule gFingerprinterDetection("FingerprinterDetection");
 
 #define RESIST_FINGERPRINTINGPROTECTION_OVERRIDE_PREF \
   "privacy.fingerprintingProtection.overrides"
-#define GLEAN_DATA_SUBMISSION_PREF "datareporting.healthreport.uploadEnabled"
-#define USER_CHARACTERISTICS_UUID_PREF \
-  "toolkit.telemetry.user_characteristics_ping.uuid"
-
 #define RFP_TIMER_UNCONDITIONAL_VALUE 20
 #define LAST_PB_SESSION_EXITED_TOPIC "last-pb-context-exited"
-#define IDLE_TOPIC "browser-idle-startup-tasks-finished"
 
 static constexpr uint32_t kVideoFramesPerSec = 30;
 static constexpr uint32_t kVideoDroppedRatio = 5;
@@ -162,7 +156,6 @@ already_AddRefed<nsRFPService> nsRFPService::GetOrCreate() {
 
 static const char* gCallbackPrefs[] = {
     RESIST_FINGERPRINTINGPROTECTION_OVERRIDE_PREF,
-    GLEAN_DATA_SUBMISSION_PREF,
     nullptr,
 };
 
@@ -183,9 +176,6 @@ nsresult nsRFPService::Init() {
 
     rv = obs->AddObserver(this, OBSERVER_TOPIC_IDLE_DAILY, false);
     NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = obs->AddObserver(this, IDLE_TOPIC, false);
-    NS_ENSURE_SUCCESS(rv, rv);
   }
 
   Preferences::RegisterCallbacks(nsRFPService::PrefChanged, gCallbackPrefs,
@@ -283,7 +273,6 @@ void nsRFPService::StartShutdown() {
     if (XRE_IsParentProcess()) {
       obs->RemoveObserver(this, LAST_PB_SESSION_EXITED_TOPIC);
       obs->RemoveObserver(this, OBSERVER_TOPIC_IDLE_DAILY);
-      obs->RemoveObserver(this, IDLE_TOPIC);
     }
   }
 
@@ -301,21 +290,10 @@ void nsRFPService::PrefChanged(const char* aPref, void* aSelf) {
 }
 
 void nsRFPService::PrefChanged(const char* aPref) {
-  MOZ_LOG(gResistFingerprintingLog, LogLevel::Info,
-          ("Pref Changed: %s", aPref));
   nsDependentCString pref(aPref);
 
   if (pref.EqualsLiteral(RESIST_FINGERPRINTINGPROTECTION_OVERRIDE_PREF)) {
     UpdateFPPOverrideList();
-  } else if (pref.EqualsLiteral(GLEAN_DATA_SUBMISSION_PREF)) {
-    if (XRE_IsParentProcess() &&
-        !Preferences::GetBool(GLEAN_DATA_SUBMISSION_PREF, false)) {
-      MOZ_LOG(gResistFingerprintingLog, LogLevel::Info, ("Clearing UUID"));
-      // If the user has unset the telemetry pref, wipe out the UUID pref value
-      // (The data will also be erased server-side via the "deletion-request"
-      // ping)
-      Preferences::SetCString(USER_CHARACTERISTICS_UUID_PREF, ""_ns);
-    }
   }
 }
 
@@ -334,10 +312,6 @@ nsRFPService::Observe(nsISupports* aObject, const char* aTopic,
     ClearBrowsingSessionKey(pattern);
   }
 
-  if (!strcmp(IDLE_TOPIC, aTopic)) {
-    nsUserCharacteristics::MaybeSubmitPing();
-  }
-
   if (!strcmp(OBSERVER_TOPIC_IDLE_DAILY, aTopic)) {
     if (StaticPrefs::
             privacy_resistFingerprinting_randomization_daily_reset_enabled()) {

toolkit/components/resistfingerprinting/tests/gtest/moz.build

@@ -1,6 +1,5 @@
 UNIFIED_SOURCES += [
     "test_reduceprecision.cpp",
-    "test_usercharping.cpp",
 ]
 
 FINAL_LIBRARY = "xul-gtest"