Verified Commit 6ef94318 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by ma1
Browse files

Bug 1860020 - Remove the assertion on the value of toolkit.telemetry.enabled. r=KrisWright,chutten 

Bug 1444275 introduced an assertion on the parent process to check that
the value of toolkit.telemetry.enabled is the expected one.
However, this expected value could be different from the one set and
locked e.g. in some forks. Therefore, the assertion prevented debug
builds from working in these cases.

Differential Revision: https://phabricator.services.mozilla.com/D195080
parent 44544921

modules/libpref/Preferences.cpp

+0 −15
Original line number Diff line number Diff line
@@ -3637,16 +3637,6 @@ void Preferences::SetupTelemetryPref() { 
  Preferences::Lock(kTelemetryPref);

}



static void CheckTelemetryPref() {

  MOZ_ASSERT(!XRE_IsParentProcess());



  // Make sure the children got passed the right telemetry pref details.

  DebugOnly<bool> value;

  MOZ_ASSERT(NS_SUCCEEDED(Preferences::GetBool(kTelemetryPref, &value)) &&

             value == TelemetryPrefValue());

  MOZ_ASSERT(Preferences::IsLocked(kTelemetryPref));

}



#endif  // MOZ_WIDGET_ANDROID



/* static */
@@ -3687,11 +3677,6 @@ already_AddRefed<Preferences> Preferences::GetInstanceForService() { 
      Preferences::SetPreference(gChangedDomPrefs->ElementAt(i));

    }

    gChangedDomPrefs = nullptr;



#ifndef MOZ_WIDGET_ANDROID

    CheckTelemetryPref();

#endif



  } else {

    // Check if there is a deployment configuration file. If so, set up the

    // pref config machinery, which will actually read the file.